From 366ccd14c33d8539f9f48ca50847c426bba23a9d Mon Sep 17 00:00:00 2001 From: alazo Date: Tue, 14 Aug 2018 13:51:04 +0200 Subject: [PATCH] Invert M3 and M12 module --- cms/pdf.py | 44 ++++++++++++++++++++++------------------ templates/cms/index.html | 16 +++++++++++---- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/cms/pdf.py b/cms/pdf.py index 65bb092..8141a64 100644 --- a/cms/pdf.py +++ b/cms/pdf.py @@ -231,13 +231,14 @@ class FormationPlanPdf(EpcBaseDocTemplate): ['Domaines', 'Processus', 'Sem1', 'Sem2', 'Sem3', 'Sem4', 'Sem5', 'Sem6'], [self.formating(domain[0]), self.formating(process[0], 60), 'M01', '', '', '', '', ''], [self.formating(''), self.formating('', 60), 'M02', '', '', '', '', ''], - [self.formating(''), self.formating(process[1], 60), '', '', '', 'M03', '', ''], + [self.formating(''), self.formating(process[1], 60), '', '', '', '', 'M03', ''], [self.formating(''), self.formating('', 60), '', 'M04', '', '', '', ''], [self.formating(domain[1]), self.formating(process[2], 60), 'M05', '', 'M06', '', '', ''], [self.formating(''), self.formating(process[3], 60), '', '', '', '', 'M07', 'M09'], [self.formating(''), self.formating('', 60), '', '', '', '', 'M08', ''], - [self.formating(domain[2]), self.formating(process[4], 60), '', '', 'M10', '', 'M12'], + [self.formating(domain[2]), self.formating(process[4], 60), '', '', 'M10', '', ''], [self.formating(''), self.formating(process[5], 60), '', '', 'M11', '', ''], + [self.formating(''), self.formating('', 60), '', '', '', 'M12', '', ''], [self.formating(domain[3]), self.formating(process[6], 60), '', '', 'M13', '', 'M14', ''], [self.formating(domain[4]), self.formating(process[7], 60), 'M15', '', '', '', '', ''], [self.formating(domain[5]), self.formating(process[8], 60), 'M16_1', '', 'M16_2', '', 'M16_3', ''], @@ -261,10 +262,11 @@ class FormationPlanPdf(EpcBaseDocTemplate): ('SPAN', (1, 3), (1, 4)), ('BACKGROUND', (0, 1), (1, 4), settings.DOMAINE_COULEURS['D1']), ('BACKGROUND', (2, 1), (2, 2), settings.DOMAINE_COULEURS['D1']), - ('BACKGROUND', (5, 3), (5, 3), settings.DOMAINE_COULEURS['D1']), + ('BACKGROUND', (6, 3), (6, 3), settings.DOMAINE_COULEURS['D1']), ('BACKGROUND', (3, 4), (3, 4), settings.DOMAINE_COULEURS['D1']), # Domaine 2 ('SPAN', (0, 5), (0, 7)), + ('SPAN', (1, 6), (1, 7)), ('BACKGROUND', (0, 5), (1, 7), settings.DOMAINE_COULEURS['D2']), ('BACKGROUND', (2, 5), (2, 5), settings.DOMAINE_COULEURS['D2']), ('BACKGROUND', (4, 5), (4, 5), settings.DOMAINE_COULEURS['D2']), @@ -272,33 +274,35 @@ class FormationPlanPdf(EpcBaseDocTemplate): ('BACKGROUND', (7, 6), (7, 6), settings.DOMAINE_COULEURS['D2']), ('BACKGROUND', (6, 7), (6, 7), settings.DOMAINE_COULEURS['D2']), # Domaine 3 - ('SPAN', (0, 8), (0, 9)), - ('SPAN', (1, 6), (1, 7)), + ('SPAN', (0, 8), (0, 10)), + ('SPAN', (1, 9), (1, 10)), ('SPAN', (4, 8), (5, 8)), ('SPAN', (4, 9), (5, 9)), - ('BACKGROUND', (0, 8), (1, 9), settings.DOMAINE_COULEURS['D3']), - ('BACKGROUND', (4, 8), (6, 8), settings.DOMAINE_COULEURS['D3']), + ('BACKGROUND', (0, 8), (1, 10), settings.DOMAINE_COULEURS['D3']), + ('BACKGROUND', (4, 8), (5, 8), settings.DOMAINE_COULEURS['D3']), ('BACKGROUND', (4, 9), (5, 9), settings.DOMAINE_COULEURS['D3']), + ('BACKGROUND', (5, 10), (5, 10), settings.DOMAINE_COULEURS['D3']), + # Domaine 4 - ('BACKGROUND', (0, 10), (1, 10), settings.DOMAINE_COULEURS['D4']), - ('BACKGROUND', (4, 10), (4, 10), settings.DOMAINE_COULEURS['D4']), - ('BACKGROUND', (6, 10), (6, 10), settings.DOMAINE_COULEURS['D4']), + ('BACKGROUND', (0, 11), (1, 11), settings.DOMAINE_COULEURS['D4']), + ('BACKGROUND', (4, 11), (4, 11), settings.DOMAINE_COULEURS['D4']), + ('BACKGROUND', (6, 11), (6, 11), settings.DOMAINE_COULEURS['D4']), # Domaine 5 - ('SPAN', (2, 11), (-1, 11)), - ('BACKGROUND', (0, 11), (-1, 11), settings.DOMAINE_COULEURS['D5']), + ('SPAN', (2, 12), (-1, 12)), + ('BACKGROUND', (0, 12), (-1, 12), settings.DOMAINE_COULEURS['D5']), # Domaine 6 - ('SPAN', (2, 12), (3, 12)), - ('SPAN', (4, 12), (5, 12)), - ('SPAN', (6, 12), (7, 12)), - ('BACKGROUND', (0, 12), (-1, 12), settings.DOMAINE_COULEURS['D6']), - # Domaine 7 ('SPAN', (2, 13), (3, 13)), ('SPAN', (4, 13), (5, 13)), ('SPAN', (6, 13), (7, 13)), - ('BACKGROUND', (0, 13), (-1, 13), settings.DOMAINE_COULEURS['D7']), + ('BACKGROUND', (0, 13), (-1, 13), settings.DOMAINE_COULEURS['D6']), + # Domaine 7 + ('SPAN', (2, 14), (3, 14)), + ('SPAN', (4, 14), (5, 14)), + ('SPAN', (6, 14), (7, 14)), + ('BACKGROUND', (0, 14), (-1, 14), settings.DOMAINE_COULEURS['D7']), # Domaine 8 - ('SPAN', (2, 14), (-1, 14)), - ('BACKGROUND', (0, 14), (-1, 14), settings.DOMAINE_COULEURS['D8']), + ('SPAN', (2, 15), (-1, 15)), + ('BACKGROUND', (0, 15), (-1, 15), settings.DOMAINE_COULEURS['D8']), ] ) ) diff --git a/templates/cms/index.html b/templates/cms/index.html index 87e6232..1c41294 100644 --- a/templates/cms/index.html +++ b/templates/cms/index.html @@ -39,8 +39,8 @@     - {{ M03.url_code }}   + {{ M03.url_code }}   @@ -83,22 +83,30 @@ - {{ D3.url }} + {{ D3.url }} {{ P05.url }}     {{ M10.url_code }} - {{ M12.url_code }} +   - {{ P06.url }} + {{ P06.url }}     {{ M11.url_code }}     + + +   +   + {{ M12.url_code }} +   +   + {{ D4.url }}