refactoring and fix colour computation
refactoring and fix colour computation

laclasse-com/service-cahiertextes,laclasse-com/service-cahiertextes,laclasse-com/service-cahiertextes,laclasse-com/service-cahiertextes,laclasse-com/service-cahiertextes