Commit 3f3b26ac authored by Pascal MOLIN's avatar Pascal MOLIN
Browse files

Merge branch 'fixdatapath' into 'master'

on remet chemin par defaut dans data plutot que data/current pour ne pas...

See merge request !69
parents b786a959 578e2e83
......@@ -8,6 +8,7 @@
{ "code" : 6651 , "title" : "Math3" , "label" : "MATH3" , "parcours" : "math" , "year" : "l1" } ,
{ "code" : 6658 , "title" : "Math4" , "label" : "MATH4" , "parcours" : "math" , "year" : "l1" } ,
{ "code" : 7295 , "title" : "Metis" , "label" : "Metis" , "parcours" : "math" , "year" : "l1" } ,
{ "code" : 11220 , "title" : "DLPM" , "label" : "DLPM" , "parcours" : "math" , "year" : "l1" } ,
{ "code" : 6594 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "miashs" , "year" : "l1" , "annexe" : true} ,
{ "code" : 6605 , "title" : "MiashsEco1" , "label" : "ECO1" , "parcours" : "miashs" , "year" : "l1" } ,
{ "code" : 6606 , "title" : "MiashsEco2" , "label" : "ECO2" , "parcours" : "miashs" , "year" : "l1" } ,
......@@ -154,7 +155,6 @@
{ "code" : 2426 , "title" : "MathInfo2" , "label" : "MathInfo2" , "parcours" : "mathinfo" , "year" : "l3" } ,
{ "code" : 2203 , "title" : "MathInfo2" , "label" : "MathInfo2" , "parcours" : "mathinfo" , "year" : "l3" } ,
{ "code" : 12499 , "title" : "Tutorat" , "label" : "Tutorat" , "parcours" : "mathinfo" , "year" : "ufr-divers" } ,
{ "code" : 1607 , "title" : "Salle de Travail" , "label" : "Salles de Travail" , "parcours" : "mathinfo" , "year" : "ufr-divers" } ,
{ "code" : 5517 , "title" : "INGEMath" , "label" : "IngeMath1" , "parcours" : "ingemath" , "year" : "l3" } ,
{ "code" : 4814 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "mathens" , "year" : "l3" , "annexe" : true} ,
{ "code" : 5511 , "title" : "MathEns" , "label" : "MathEns1" , "parcours" : "mathens" , "year" : "l3" } ,
......@@ -192,16 +192,44 @@
{ "code" : "5512.MT16Y060" , "title" : "MathFonda1" , "label" : "Ouv.S." , "parcours" : "math" , "year" : "l3-sem6" } ,
{ "code" : "5512.MT16Y130" , "title" : "MathFonda1" , "label" : "Hist-Ph. Maths" , "parcours" : "math" , "year" : "l3-sem6" } ,
{ "code" : 12499 , "title" : "Tutorat" , "label" : "Tutorat" , "parcours" : "math" , "year" : "ufr-divers" } ,
{ "code" : 1607 , "title" : "Salle de Travail" , "label" : "Salles de Travail" , "parcours" : "math" , "year" : "ufr-divers" } ,
{ "code" : 4819 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "miashs" , "year" : "l3" , "annexe" : true} ,
{ "code" : 5510 , "title" : "MiashsEco1" , "label" : "L3Miashs1" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 5509 , "title" : "MiashsEco2" , "label" : "L3Miashs2" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 5510 , "title" : "MiashsECO1" , "label" : "L3Miashs1" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 5509 , "title" : "MiashsECO2" , "label" : "L3Miashs2" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 12446 , "title" : "L3SES-Gr4" , "label" : "L3SES-Gr1" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 12447 , "title" : "L3SES-Gr5" , "label" : "L3SES-Gr2" , "parcours" : "miashs" , "year" : "l3" } ,
{ "code" : 6929 , "title" : "L3Socio" , "label" : "Groupe 1" , "parcours" : "socio" , "year" : "l3" } ,
{ "code" : 6929 , "title" : "L3Socio" , "label" : "Groupe 1" , "parcours" : "socio" , "year" : "l3" } ,
{ "code" : 6927 , "title" : "L3Socio" , "label" : "Groupe 2" , "parcours" : "socio" , "year" : "l3" } ,
{ "code" : 6928 , "title" : "L3Socio" , "label" : "Groupe 3" , "parcours" : "socio" , "year" : "l3" } ,
{ "code" : 4373 , "title" : "L3Socio" , "label" : "Groupe 4" , "parcours" : "socio" , "year" : "l3" } ,
{ "code" : 5510 , "title" : "Miashsbase1" , "label" : "L3Miashs1" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : 5509 , "title" : "Miashsbase2" , "label" : "L3Miashs2" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05Y010" , "title" : "Anth.so.cult" , "label" : "Anth.so.cult" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05Y020" , "title" : "Le sujet au travail" , "label" : "Le sujet" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05ou6Y030" , "title" : "intro socio clinique" , "label" : "intr.soc.clinique" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05ou6Y050" , "title" : "Anth.so.cult" , "label" : "Anth.soc.cult" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05ou6Y060" , "title" : "philo politique" , "label" : "phil.pol." , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.SO05ou6Y090" , "title" : "intro soc politique" , "label" : "Int.soc.pol.1" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6927.SO05ou6Y090" , "title" : "intro soc politique" , "label" : "Int.soc.pol.2" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6929.questionnaires" , "title" : "enquetes" , "label" : "Quest.1" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6927.questionnaires" , "title" : "enquetes" , "label" : "Quest.2" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "6928.questionnaires" , "title" : "enquetes" , "label" : "Quest.3" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : "4373.questionnaires" , "title" : "enquetes" , "label" : "Quest.4" , "parcours" : "socio" , "year" : "miashs-s5" } ,
{ "code" : 5510 , "title" : "Miashsbase1" , "label" : "L3Miashs1" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : 5509 , "title" : "Miashsbase2" , "label" : "L3Miashs2" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO06Y010" , "title" : "epistemologie" , "label" : "Epist.1" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6927.SO06Y010" , "title" : "epistemologie" , "label" : "Epist.2" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO06Y020" , "title" : "socio urbaine" , "label" : "Soc.Urb.1" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6927.SO06Y020" , "title" : "socio urbaine" , "label" : "Soc.Urb.2" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO05ou6Y030" , "title" : "Migration relations interethniques" , "label" : "M&R.Inter." , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO06Y040" , "title" : "Migration relations interethniques app" , "label" : "M&R.Inter.+" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO05ou6Y060" , "title" : "Genre 3" , "label" : "Genre" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO06Y070" , "title" : "Polit cult" , "label" : "Pol.Cult" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.SO05ou6Y090" , "title" : "meth quali" , "label" : "Meth.Quali.1" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6927.SO05ou6Y090" , "title" : "meth quali" , "label" : "Meth.Quali.2" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6929.questionnaires" , "title" : "enquetes" , "label" : "Quest.1" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6927.questionnaires" , "title" : "enquetes" , "label" : "Quest.2" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "6928.questionnaires" , "title" : "enquetes" , "label" : "Quest.3" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : "4373.questionnaires" , "title" : "enquetes" , "label" : "Quest.4" , "parcours" : "socio" , "year" : "miashs-s6" } ,
{ "code" : 6612 , "title" : "MiashsLing" , "label" : "L1Miashs" , "parcours" : "miashs" , "year" : "ling" } ,
{ "code" : 4557 , "title" : "uelibreling" , "label" : "Option L1-L2" , "parcours" : "miashs" , "year" : "ling" } ,
{ "code" : 6604 , "title" : "MiashsLingu" , "label" : "L2Miashs" , "parcours" : "miashs" , "year" : "ling" } ,
......@@ -213,7 +241,6 @@
{ "code" : "5909.l3sdl_l3miashs" , "title" : "L3SDL-Gr1" , "label" : "L3SDL-Gr1" , "parcours" : "miashs" , "year" : "ling" } ,
{ "code" : "5910.l3sdl_l3miashs" , "title" : "L3SDL-Gr2" , "label" : "L3SDL-Gr2" , "parcours" : "miashs" , "year" : "ling" } ,
{ "code" : 12499 , "title" : "Tutorat" , "label" : "Tutorat" , "parcours" : "miashs" , "year" : "ufr-divers" } ,
{ "code" : 1607 , "title" : "Salle de Travail" , "label" : "Salles de Travail" , "parcours" : "miashs" , "year" : "ufr-divers" } ,
{ "code" : 6343 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "phys" , "year" : "l1" , "annexe" : true} ,
{ "code" : 6361 , "title" : "Physique1" , "label" : "PHY1" , "parcours" : "phys" , "year" : "l1" } ,
{ "code" : 6362 , "title" : "Physique2" , "label" : "PHY2" , "parcours" : "phys" , "year" : "l1" } ,
......@@ -228,7 +255,9 @@
{ "code" : 6532 , "title" : "CUPGE" , "label" : "CUPGE1" , "parcours" : "cupge" , "year" : "l1" } ,
{ "code" : 6533 , "title" : "CUPGE" , "label" : "CUPGE2" , "parcours" : "cupge" , "year" : "l1" } ,
{ "code" : 6534 , "title" : "DLPC" , "label" : "DLPC" , "parcours" : "cupge" , "year" : "l1" } ,
{ "code" : 6534 , "title" : "DLPC" , "label" : "DLPC" , "parcours" : "dlpc" , "year" : "l1" } ,
{ "code" : 11220 , "title" : "DLPM" , "label" : "DLPM" , "parcours" : "cupge" , "year" : "l1" } ,
{ "code" : 6534 , "title" : "DLPC" , "label" : "DLPC" , "parcours" : "dlp-cm" , "year" : "l1" } ,
{ "code" : 11220 , "title" : "DLPM" , "label" : "DLPM" , "parcours" : "dlp-cm" , "year" : "l1" } ,
{ "code" : 6535 , "title" : "EPC" , "label" : "EPC" , "parcours" : "epc" , "year" : "l1" } ,
{ "code" : 5259 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "chimie" , "year" : "l1" , "annexe" : true} ,
{ "code" : 5633 , "title" : "CHIM1" , "label" : "CHIM1" , "parcours" : "chimie" , "year" : "l1" } ,
......@@ -257,7 +286,7 @@
{ "code" : 6675 , "title" : "PHYTECH" , "label" : "PHYTECH" , "parcours" : "phys" , "year" : "l2" } ,
{ "code" : 6652 , "title" : "CUPGE" , "label" : "CUPGE1" , "parcours" : "cupge" , "year" : "l2" } ,
{ "code" : 6653 , "title" : "CUPGE" , "label" : "CUPGE2" , "parcours" : "cupge" , "year" : "l2" } ,
{ "code" : 6147 , "title" : "DLPC" , "label" : "DLPC" , "parcours" : "dlpc" , "year" : "l2" } ,
{ "code" : 6147 , "title" : "DLPC" , "label" : "DLPC" , "parcours" : "dlp-cm" , "year" : "l2" } ,
{ "code" : 6668 , "title" : "EPC" , "label" : "EPC" , "parcours" : "epc" , "year" : "l2" } ,
{ "code" : 5277 , "title" : "AncVersion" , "label" : "obsolète" , "parcours" : "chimie" , "year" : "l2" , "annexe" : true} ,
{ "code" : 5638 , "title" : "CHIM1" , "label" : "CHIM1" , "parcours" : "chimie" , "year" : "l2" } ,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
#!/bin/sh
cd $HOME/ical-ufr && conda run -n ical python get_ical.py --presets='2022-23'
#!/bin/bash
cd $HOME/ical-ufr && $HOME/miniconda2/bin/conda run -n ical python get_ical.py --presets='2022-23'
2021-22
\ No newline at end of file
2021-22
\ No newline at end of file
......@@ -17,17 +17,18 @@
{ "code": "2414,3196,6922,5418,7372", "title": "L3SES-MiashsGr3", "fiches": "5423"},
{ "code": "2414,3196,6922,5418,7356,7349,7330,7196,7372,12448,12082,7360,7353", "title": "L3SES-MiashsGr4", "fiches": "12446"},
{ "code": "2414,3196,6922,5418,7356,7349,7330,7196,12448,12082,12077,7361,7354", "title": "L3SES-MiashsGr5", "fiches": "12447"},
{ "code": "5256,5258,5260,5257,5262,5263", "title": "UElibres ling", "fiches": "4557"},
{ "code": "5256,5258,5260,2626,5257,5262,5263", "title": "UElibres ling", "fiches": "4557"},
{ "code": "5271,5272,5254,7649,7648,7647,5908,5902,5905,6789,6795,6791,5907,5911", "title": "L3SDL-Gr1", "fiches": "5909"},
{ "code": "5271,5272,5254,7649,7648,7647,5908,5901,5904,6790,6796", "title": "L3SDL-Gr2", "fiches": "5910"},
{ "code": "5057", "title": "L1Socio", "fiches": "5867,5868,5869,5870,5871,5872,5873"},
{ "code": "4888", "title": "L2Socio", "fiches": "5880,5881,5882,5883,6946"},
{ "code": "5057,11235", "title": "L1Socio", "fiches": "5867,5868,5869,5870,5871,5872,5873"},
{ "code": "4888,11237", "title": "L2Socio", "fiches": "5880,5881,5882,5883,6946"},
{ "code": "4656,5664", "title": "L3Socio", "fiches": "6929,6927,6928,4373"},
{ "code": 4601, "title": "L3ProfEcoles", "fiches": "7240,7241"},
{ "code": 6343, "title": "L1Physique", "fiches": "6361,6362,6363,6371,6639,8068,8069"},
{ "code": 6345, "title": "L1EPC", "fiches": "6534"},
{ "code": 6346, "title": "L1EPC", "fiches": "6535"},
{ "code": 6347, "title": "L1CUPGE", "fiches": "6532,6533"},
{ "code": 11219, "title": "L1DLPM", "fiches": "11220"},
{ "code": 6769, "title": "L1STEP", "fiches": "6770,6771"},
{ "code": 5259, "title": "L1Chimie", "fiches": "5633,5634,5635,5636"},
{ "code": 5274, "title": "L1ChimieBio", "fiches": "5637"},
......
......@@ -68,10 +68,11 @@ def modifdate(m,shift):
if debut.month > 7:
# l'annee vaut pour aout-decembre. (Semestre 1)
if debut.year == 2021:
#if debut.year == 2021:
# annee 2021-2022
heurefrontiere = 12
shiftete = -10
#on a un etalon pour 2021-2022 on evite la config manuelle
#heurefrontiere = 12
#shiftete = -10
if debut.year == 2020:
# annee 2020-2021
......@@ -90,10 +91,12 @@ def modifdate(m,shift):
shift = shiftete
if debut.month<8:
# l'annee vaut pour janvier-juillet (Semestre2)
if debut.year == 2022:
#if debut.year == 2022:
# annee 2021-2022
heurefrontiere = 13
shiftete = -9
#on a un etalon pour 2021-2022 on evite la config manuelle
#heurefrontiere = 13
#shiftete = -9
if debut.year == 2021:
# annee 2020-2021
heurefrontiere = 11
......@@ -333,7 +336,7 @@ def fix_timezone(ical,icalname=""):
return ical
def cherchedeplacements(fcalen = 'calendars.json', outdir='data/current', oldoutdir='data.28/current', labelobsolete='obsolète'):
def cherchedeplacements(fcalen = 'calendars.json', outdir='data', oldoutdir='data.28', labelobsolete='obsolète'):
"""
Cherche les différences dans les deux versions de tous les calendriers de chaque formation pour:
......@@ -430,7 +433,7 @@ def cherchedeplacements(fcalen = 'calendars.json', outdir='data/current', oldout
f.write(revariable.sub('',oldevents[key])+"\n")
else:
print("[WARNING] (%s) plus de 50 chts et plus de 1/4 de modifications; on ne les enregistre pas."%(c))
print("[WARNING] si les données de référence (data.28/current/) sont fiables il faut vérifier data/current\n(et voir s'il n'y a pas un problème de shift/calibrage ADE?)")
print("[WARNING] si les données de référence (data.28) sont fiables il faut vérifier data\n(et voir s'il n'y a pas un problème de shift/calibrage ADE?)")
f.write("END:VCALENDAR\n")
......@@ -446,7 +449,7 @@ def tests():
ical=fix_timezone(ical)
f.close()
print("Test L1 MATH3 semaine du 11/10/21")
dest=open("data/current/6651.ics","w")
dest=open("data/6651.ics","w")
dest.write(ical)
dest.close()
f2=open("test_5510L3MIASHS1delta_moins11.ics")
......@@ -454,7 +457,7 @@ def tests():
ical=fix_timezone(ical)
f2.close()
print("Test L3 MIASHS GR1 semaine du 15/11/21")
dest2=open("data/current/5510.ics","w")
dest2=open("data/5510.ics","w")
dest2.write(ical)
dest2.close()
......@@ -586,7 +589,8 @@ def main(start, end, year=4, fiche_etalon='2769,',
formations='formations.json',
calendars='calendars.json',
external='calendars_external.json',
outdir='data/current',
outdir='data',
oldoutdir='data.28',
dryrun=False, verbose=False):
if formations:
......@@ -595,7 +599,7 @@ def main(start, end, year=4, fiche_etalon='2769,',
dryrun=dryrun, verbose=verbose)
if calendars:
cherchedeplacements(calendars, outdir)
cherchedeplacements(calendars, outdir, oldoutdir)
if external:
get_external(external, outdir,
......@@ -603,7 +607,7 @@ def main(start, end, year=4, fiche_etalon='2769,',
# paramètres ADE ufr maths
presets = {
'2022-23': dict(start="2022-08-23", end="2023-07-17", year=10),
'2022-23': dict(start="2022-08-23", end="2023-07-17", year=10, fiche_etalon="1607,"),
'2021-22': dict(start="2021-08-23", end="2022-07-17", year=4, fiche_etalon="2769,"),
'2020-21': dict(start="2020-08-31", end="2021-07-14", year=15),
'2019-20': dict(start="2019-08-31", end="2020-07-14", year=6),
......@@ -622,14 +626,16 @@ parser.add_argument('--end', type=str, default='2022-07-17',
help='last day, format yyyy-mm-dd')
parser.add_argument('--year', type=int, default=4,
help='ADE year')
parser.add_argument('--fiche_etalon', type=str, default='',
parser.add_argument('--fiche_etalon', type=str, default='2769,',
help='fiches à ajouter à chaque récupération')
parser.add_argument('--formations', type=str, default='formations.json',
help='json file describing calendar views')
parser.add_argument('--calendars', type=str, default='calendars.json',
help='json file describing calendar views')
parser.add_argument('--outdir', type=str, default='data/current',
help='directory to save ics files')
parser.add_argument('--outdir', type=str, default='data',
help='directory to save ics files'),
parser.add_argument('--oldoutdir', type=str, default='data.28',
help='directory to save old ics files for diff button')
parser.add_argument('--external', type=str, default='calendars_external.json',
help='json file listing external (non ADE) ressources')
parser.add_argument('--presets', choices=presets.keys(), help='automatic choice of --start, --end, --outdir options')
......@@ -638,6 +644,7 @@ if __name__ == '__main__':
args = parser.parse_args()
if args.presets:
args.outdir = 'data/%s'%args.presets
args.oldoutdir = 'data.28/%s'%args.presets
args.__dict__.update(presets[args.presets])
main(args.start, args.end, args.year, args.fiche_etalon,
formations=args.formations,
......
......@@ -2705,7 +2705,8 @@
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
"node_modules/batch": {
"version": "0.6.1",
......@@ -2800,6 +2801,7 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3074,7 +3076,8 @@
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
"node_modules/connect-history-api-fallback": {
"version": "1.6.0",
......@@ -4287,7 +4290,8 @@
"node_modules/fastest-levenshtein": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
"dev": true
},
"node_modules/faye-websocket": {
"version": "0.11.4",
......@@ -4496,7 +4500,8 @@
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"node_modules/fsevents": {
"version": "2.3.2",
......@@ -4601,6 +4606,7 @@
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dev": true,
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
......@@ -5011,6 +5017,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
......@@ -5368,7 +5375,8 @@
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
"node_modules/isobject": {
"version": "3.0.1",
......@@ -5826,6 +5834,7 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true,
"dependencies": {
"brace-expansion": "^1.1.7"
},
......@@ -5836,7 +5845,8 @@
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
"node_modules/multicast-dns": {
"version": "7.2.5",
......@@ -8346,6 +8356,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"dependencies": {
"wrappy": "1"
}
......@@ -8516,6 +8527,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
......@@ -9549,6 +9561,7 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"dev": true,
"dependencies": {
"glob": "^7.1.3"
},
......@@ -9623,6 +9636,7 @@
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
}
......@@ -10182,7 +10196,8 @@
"node_modules/text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
"dev": true
},
"node_modules/thunky": {
"version": "1.1.0",
......@@ -10900,6 +10915,7 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"dependencies": {
"isexe": "^2.0.0"
},
......@@ -10962,7 +10978,8 @@
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
"node_modules/ws": {
"version": "8.6.0",
......@@ -12980,7 +12997,8 @@
"balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
"batch": {
"version": "0.6.1",
......@@ -13064,6 +13082,7 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -13270,7 +13289,8 @@
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
"connect-history-api-fallback": {
"version": "1.6.0",
......@@ -14164,7 +14184,8 @@
"fastest-levenshtein": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
"dev": true
},
"faye-websocket": {
"version": "0.11.4",
......@@ -14320,7 +14341,8 @@
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"fsevents": {
"version": "2.3.2",
......@@ -14391,6 +14413,7 @@
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
......@@ -14687,6 +14710,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
......@@ -14918,7 +14942,8 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
"isobject": {
"version": "3.0.1",
......@@ -15265,6 +15290,7 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -15272,7 +15298,8 @@
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
"multicast-dns": {
"version": "7.2.5",
......@@ -16970,6 +16997,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": {
"wrappy": "1"
}
......@@ -17094,7 +17122,8 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
"path-key": {
"version": "3.1.1",
......@@ -17790,6 +17819,7 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"dev": true,
"requires": {
"glob": "^7.1.3"
}
......@@ -17847,7 +17877,8 @@
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"send": {
"version": "0.18.0",
......@@ -18277,7 +18308,8 @@
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
"dev": true
},
"thunky": {
"version": "1.1.0",
......@@ -18799,6 +18831,7 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
......@@ -18843,7 +18876,8 @@
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
"ws": {
"version": "8.6.0",
......
......@@ -10,7 +10,7 @@
"mathens": "Maths pour l'enseignement",
"phys": "Physique",
"cupge": "CUPGE",
"dlpc": "Double L. Phys/Chim",
"dlp-cm": "Double L. Phys Chim/Maths",
"epc": "Enseignement Phys/Chim",
"step": "S.T.E.P",
"chimie": "Chimie",
......
......@@ -39,7 +39,8 @@ export function archiveCalendars(cheminarchive: string, archivedate: string) {
...calendars.map(
(cal): Group => ({
...cal,
id: `${cheminarchive}/${cal.code.toString()}`,
id: `${cal.code.toString()}`,
datasubdir: `${cheminarchive}`,
initialDate: archivedate,
})
),
......@@ -56,25 +57,25 @@ export function allGroups(_archive: string|null, _manualdate: string|null): Grou
if (_manualdate == null){
config.defaultInitialDate="2019-12-02";
}
return archiveCalendars("../data/2019-20", config.defaultInitialDate);
return archiveCalendars("2019-20/", config.defaultInitialDate);
}
if ("2020-21" == _archive){
if (_manualdate == null){
config.defaultInitialDate="2020-11-30";
}
return archiveCalendars("..data/2020-21", config.defaultInitialDate);
return archiveCalendars("2020-21/", config.defaultInitialDate);
}
if ("2021-22" == _archive){
if (_manualdate == null){
config.defaultInitialDate="2021-09-06";
}
return archiveCalendars("../data/2021-22", config.defaultInitialDate);
return archiveCalendars("2021-22/", config.defaultInitialDate);
}
if ("2022-23" == _archive){
if (_manualdate == null){
config.defaultInitialDate="2022-08-29";
}
return archiveCalendars("../data/2022-23", config.defaultInitialDate);