diff --git a/Makefile b/Makefile index 0d57178..7c67d57 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,13 @@ -all: - ./script.sh +FORMATION=besançon2_CMI besançon2 besançon bordeaux dijon_EI dijon_MI grenoble lyon nancy rennes +DATA=$(addsuffix .csv, $(addprefix data/, ${FORMATION})) +CAT=$(addsuffix .cat, ${DATA}) + +all: www/programme.html +%.cat: % + ./parse.sh $< +www/programme.html: www/programme.template ${CAT} + ./build.sh deploy: scp -r www/* lccanon@lifc-home.univ-fcomte.fr:public_html/ clean: - -rm data/*.cat data/*.theme data/theme.txt www/programme.html 2> /dev/null + -rm ${CAT} data/*.theme data/csv.cat data/csv.theme data/theme.txt www/programme.html 2> /dev/null diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..18b8825 --- /dev/null +++ b/build.sh @@ -0,0 +1,14 @@ +#! /bin/bash + +# Generate web page with graphical results + +cp www/programme.template www/programme.html + +IFS=$'\n' +for FILE in $(ls -1 data) +do + if [ $(grep "\[$FILE\]" www/programme.html | tr -d '\n') ] + then + sed -i "s/\[$FILE\]/[$(head -c -1 -q data/$FILE)]/g" www/programme.html + fi +done diff --git a/parse.sh b/parse.sh new file mode 100755 index 0000000..60da7b0 --- /dev/null +++ b/parse.sh @@ -0,0 +1,55 @@ +#! /bin/bash + +cut -d ";" -f 4 data/*.csv | sort | uniq > data/theme.txt + +THEMES=$(cat data/theme.txt | tr "\n" ",") +CATEGORIES=$(grep -o -E "^[^(]*" categorie.txt | sed "s/ $//" | tr "\n" ",") +THEMES=$(echo $THEMES | sed "s/,/\",\"/g" | sed "s/^/\"/" | sed "s/,\"$//") +CATEGORIES=$(echo $CATEGORIES | sed "s/,/\",\"/g" | sed "s/^/\"/" | sed "s/,\"$//") + +echo $THEMES > data/csv.theme +echo $CATEGORIES > data/csv.cat + +FORMATION=$1 +echo -n $FORMATION + +echo -n -e " (" +echo -n $(cut -d ";" -f 3 $FORMATION | paste -sd+ | bc) +echo " ECTS)" + +> $FORMATION.theme +> $FORMATION.cat + +echo -e "\tPar thème" + +IFS='' +cat data/theme.txt | +while read THEME +do + echo -n -e "\t\t$THEME " + ECTS=$(grep $THEME$ $FORMATION | cut -d ";" -f 3) + if [[ -z "$ECTS" ]] + then + ECTS=0 + fi + ECTS=$(echo $ECTS | tr ' ' '\n' | paste -sd+ | bc) + THEMES_ECTS=$THEMES_ECTS,$ECTS + echo -n "$ECTS," >> $FORMATION.theme + echo $ECTS +done +sed -i "s/,$/\n/" $FORMATION.theme + +echo -e "\tPar catégorie" + +IFS='' +cat categorie.txt | +while read CAT +do + CATEGORIE=$(echo $CAT | grep -o -E "^[^(]*") + PATT=$(echo $CAT | grep -o "(.*)") + echo -n -e "\t\t$CATEGORIE" + ECTS=$(grep -E $PATT$ $FORMATION | cut -d ";" -f 3 | paste -sd+ | bc) + echo -n "$ECTS," >> $FORMATION.cat + echo $ECTS +done +sed -i "s/,$/\n/" $FORMATION.cat diff --git a/script.sh b/script.sh deleted file mode 100755 index 7788a53..0000000 --- a/script.sh +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/bash - -cut -d ";" -f 4 data/*.csv | sort | uniq > data/theme.txt - -THEMES=$(cat data/theme.txt | tr "\n" ",") -CATEGORIES=$(grep -o -E "^[^(]*" categorie.txt | sed "s/ $//" | tr "\n" ",") -THEMES=$(echo $THEMES | sed "s/,/\",\"/g" | sed "s/^/\"/" | sed "s/,\"$//") -CATEGORIES=$(echo $CATEGORIES | sed "s/,/\",\"/g" | sed "s/^/\"/" | sed "s/,\"$//") - -echo $THEMES > data/csv.theme -echo $CATEGORIES > data/csv.cat - -for FORMATION in $(ls data/*.csv) -do - echo -n $FORMATION - - echo -n -e " (" - echo -n $(cut -d ";" -f 3 $FORMATION | paste -sd+ | bc) - echo " ECTS)" - - > $FORMATION.theme - > $FORMATION.cat - - echo -e "\tPar thème" - - IFS='' - cat data/theme.txt | - while read THEME - do - echo -n -e "\t\t$THEME " - ECTS=$(grep $THEME$ $FORMATION | cut -d ";" -f 3) - if [[ -z "$ECTS" ]] - then - ECTS=0 - fi - ECTS=$(echo $ECTS | tr ' ' '\n' | paste -sd+ | bc) - THEMES_ECTS=$THEMES_ECTS,$ECTS - echo -n "$ECTS," >> $FORMATION.theme - echo $ECTS - done - sed -i "s/,$/\n/" $FORMATION.theme - - echo -e "\tPar catégorie" - - IFS='' - cat categorie.txt | - while read CAT - do - CATEGORIE=$(echo $CAT | grep -o -E "^[^(]*") - PATT=$(echo $CAT | grep -o "(.*)") - echo -n -e "\t\t$CATEGORIE" - ECTS=$(grep -E $PATT$ $FORMATION | cut -d ";" -f 3 | paste -sd+ | bc) - echo -n "$ECTS," >> $FORMATION.cat - echo $ECTS - done - sed -i "s/,$/\n/" $FORMATION.cat -done - - -# Generate web page with graphical results - -cp www/programme.template www/programme.html - -IFS=$'\n' -for FILE in $(ls -1 data) -do - if [ $(grep "\[$FILE\]" www/programme.html | tr -d '\n') ] - then - sed -i "s/\[$FILE\]/[$(head -c -1 -q data/$FILE)]/g" www/programme.html - fi -done diff --git a/www/programme.template b/www/programme.template index 985564f..15aa08e 100644 --- a/www/programme.template +++ b/www/programme.template @@ -8,10 +8,11 @@ -

Objectifs

+

Comparaison des licences informatiques

+

Objectifs

L'analyse suivante compare le programme de plusieurs licences d'informatique. Il s'agit d'une approche quantitative qui mérite d'être améliorée (n'hésitez pas à me transmettre vos suggestions). L'objectif est d'identifier les lacunes que pourraient avoir nos étudiants qui intègrent d'autres masters qui correspondent mieux à leur projet, mais aussi les lacunes des étudiants extérieurs intégrant le M1.

-

Protocole

+

Protocole

Pour chaque formation, un thème a été associé à chaque enseignement ("compilation" par exemple), puis ces thèmes ont été regroupés dans des catégories plus larges de la façon suivante (chaque ligne correspond à une catégorie, les thèmes sont entre parenthèse) :