Skip to content

Commit

Permalink
Bugfix divers
Browse files Browse the repository at this point in the history 
Ajout grille IT
  • Loading branch information
@cedrick-f
cedrick-f committed Apr 27, 2020
1 parent ef76076 commit e5530e2
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 267 deletions.
Binary file modified referentiels/Ref_STI2D.xls
View file
Binary file not shown.
75 changes: 9 additions & 66 deletions referentiels/Ref_STI2D.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6607,89 +6607,32 @@
<l_ S_00="" S_01="" S_02="" S_03="" />
</d_attributs>
<d_cellulesInfo>
<d_C>
<l_Prof>
<l_00 S_00="Revue 1" S_02="">
<l_01 I_00="7" I_01="8" I_02="1" />
</l_00>
<l_01 S_00="Revue 2" S_02="">
<l_01 I_00="7" I_01="8" I_02="1" />
</l_01>
<l_02 S_00="Revue 3" S_02="">
<l_01 I_00="7" I_01="8" I_02="1" />
</l_02>
</l_Prof>
<l_Tit>
<l_00 S_00="Revue 1" S_02="">
<l_01 I_00="4" I_01="5" I_02="0" />
</l_00>
<l_01 S_00="Revue 2" S_02="">
<l_01 I_00="4" I_01="5" I_02="0" />
</l_01>
<l_02 S_00="Revue 3" S_02="">
<l_01 I_00="4" I_01="5" I_02="0" />
</l_02>
</l_Tit>
<l_Nom>
<l_00 S_00="Revue 1" S_02="">
<l_01 I_00="2" I_01="9" I_02="0" />
</l_00>
<l_01 S_00="Revue 2" S_02="">
<l_01 I_00="2" I_01="9" I_02="0" />
</l_01>
<l_02 S_00="Revue 3" S_02="">
<l_01 I_00="2" I_01="9" I_02="0" />
</l_02>
</l_Nom>
<l_Pre>
<l_00 S_00="Revue 1" S_02="">
<l_01 I_00="3" I_01="9" I_02="0" />
</l_00>
<l_01 S_00="Revue 2" S_02="">
<l_01 I_00="3" I_01="9" I_02="0" />
</l_01>
<l_02 S_00="Revue 3" S_02="">
<l_01 I_00="3" I_01="9" I_02="0" />
</l_02>
</l_Pre>
<l_Etab>
<l_00 S_00="Revue 1" S_02="">
<l_01 I_00="4" I_01="2" I_02="0" />
</l_00>
<l_01 S_00="Revue 2" S_02="">
<l_01 I_00="4" I_01="2" I_02="0" />
</l_01>
<l_02 S_00="Revue 3" S_02="">
<l_01 I_00="4" I_01="2" I_02="0" />
</l_02>
</l_Etab>
</d_C>
<d_C />
<d_E3C>
<l_Tit>
<l_00 S_00="Présentation" S_02="">
<l_01 I_00="4" I_01="5" I_02="0" />
<l_00 S_00="Grille E3C IT" S_02="">
<l_01 I_00="3" I_01="2" I_02="0" />
</l_00>
</l_Tit>
<l_Nom>
<l_00 S_00="Présentation" S_02="">
<l_01 I_00="2" I_01="9" I_02="0" />
<l_00 S_00="Grille E3C IT" S_02="">
<l_01 I_00="26" I_01="2" I_02="0" />
</l_00>
</l_Nom>
<l_Pre>
<l_00 S_00="Présentation" S_02="">
<l_01 I_00="3" I_01="9" I_02="0" />
<l_00 S_00="Grille E3C IT" S_02="">
<l_01 I_00="27" I_01="2" I_02="0" />
</l_00>
</l_Pre>
<l_Etab>
<l_00 S_00="Présentation" S_02="">
<l_00 S_00="Grille E3C IT" S_02="">
<l_01 I_00="4" I_01="2" I_02="0" />
</l_00>
</l_Etab>
</d_E3C>
</d_cellulesInfo>
<d_grilles>
<l_C S_00="STS-EE _ Revues.xlsx" S_01="I" />
<l_E3C S_00="STS-EE _ Présentation.xlsx" S_01="I" />
<l_E3C S_00="2019 Grille E3C IT_vers_provisoire_Py.xlsx" S_01="I" />
</d_grilles>
<l_listPhases S_00="Ana" S_01="Con" S_02="DCo" S_03="Rea" S_04="Val" S_05="XXX" S_06="Rev" S_07="R1" S_08="R2" S_09="R3" S_10="S" />
<l_listPhasesEval S_00="Rev" S_01="R1" S_02="R2" S_03="R3" S_04="S" />
Expand Down
2 changes: 1 addition & 1 deletion src/Referentiel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@ def getCodeProjetDefaut(self, spe = []):


#############################################################################
def getProjetDefaut(self, spe = None):
def getProjetDefaut(self, spe = []):
""" Renvoie le code de l'épreuve de projet (évaluation) par défaut
(correspondant aux spécialités <spe>)
Expand Down
13 changes: 0 additions & 13 deletions src/grilles.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,19 +667,6 @@ class PyExcel:
def __init__(self,filename=None):
# Ouverture d'EXcel
self.xlApp = getXlApp()
# try:
# self.xlApp = win32com.client.GetActiveObject('Excel.Application') # voir aussi avec DispatchEx ? ou bien win32com.client.gencache.EnsureDispatch("Excel.Application")
# except:
# try:
# self.xlApp = win32com.client.dynamic.Dispatch('Excel.Application')
# except:
# try:
# self.xlApp = win32com.client.gencache.EnsureDispatch('Excel.Application')
# except:
# try:
# self.xlApp = win32com.client.DispatchEx('Excel.Application')
# except:
# raise Exception("Impossible d'ouvrir Excel")

# Déclenche une erreur si Excel est occupé :
print("Excel :", self.xlApp)
Expand Down
Loading

0 comments on commit e5530e2

Please sign in to comment.