pablo/analyseWriter
pablo
/
analyseWriter
1
1
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

MAJ V4.4.2

This commit is contained in:
pablo rodriguez 2022-12-25 20:00:08 +01:00
parent b89548a62e
commit bc8411ee0e
5 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
analyseWriter.exe
View File

Binary file not shown.

BIN
analyseWriter.jar
View File

Binary file not shown.

3
bin/.gitignore vendored
View File

@ -125,3 +125,6 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
/sautpageColonne.svg
/sautpagecolonne.png
/sautpagecolonnemini.png

BIN
bin/evaluer/evaluationAttribut.class
View File

Binary file not shown.

96
src/evaluer/evaluationAttribut.java
View File

@ -6,7 +6,6 @@ import java.util.regex.Pattern;
import MEPTL.commandes;
import cXML.node;
import list.listeAttributsAnalyseWriter;
import list.listeDesNodesAncrable;
import list.listeDesNodesEvalPlacement;
import list.listeDesNodesFormatageDirect;
@ -264,9 +263,9 @@ public class evaluationAttribut {
// evaluation du nom de la page
if(k.equals("evalNamePage") && sujet.getNomElt().equals("page")) {
if(nodeStudent!=null) {
retour = evaluationNamePage(retour,nodeStudent, sujet.getAttributs().get("style:master-page-name"), sujet.getAttributs().get("evalNamePage"),"Page");
retour = evaluationNamePage(retour,nodeStudent, evaluation.withoutCodeAndPointPourRechercheContenuExact(sujet.getAttributs().get("style:master-page-name")), sujet.getAttributs().get("evalNamePage"),"Page");
}else {
retour = evaluationNamePage(retour,null, "Pas trouvé la page", sujet.getAttributs().get("evalNamePage"),"Page");
retour = evaluationNamePage(retour,null, evaluation.withoutCodeAndPointPourRechercheContenuExact(sujet.getAttributs().get("style:master-page-name")), sujet.getAttributs().get("evalNamePage"),"Page");
}
}
@ -467,25 +466,17 @@ public class evaluationAttribut {
*/
private static node evalEntetePasActive(node sujet, node nodeStudent, node retour, String nameElt) {
if(nodeStudent!=null) {
int nbA=0;
int nbAs=0;
String reponseSujet = "oui";
String reponseStudent = "oui";
Enumeration<String> key1 = sujet.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
}
if(nbA<=0) reponseSujet = "non";
key1 = nodeStudent.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
}
if(nbAs<=0)reponseStudent = "non";
String reponseSujet = "non";
String reponseStudent = "non";
if(sujet.getNodes().size()==0) reponseSujet="oui";
if(nodeStudent.getNodes().size()==0) reponseStudent="oui";
retour = evaluationEntetePasActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEntetePasActive"),"Entete");
}else {
retour = evaluationEntetePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEntetePasActive"),"Entete");
String reponseSujet = "non";
if(sujet.getNodes().size()==0) reponseSujet="oui";
retour = evaluationEntetePasActive(retour,null, reponseSujet, sujet.getAttributs().get("evalEntetePasActive"),"Entete");
}
return retour;
}
@ -501,19 +492,17 @@ public class evaluationAttribut {
*/
private static node evalEnteteActive(node sujet, node nodeStudent, node retour, String nameElt) {
if(nodeStudent!=null) {
int nbAs=0;
String reponseSujet = "oui";
String reponseStudent = "oui";
Enumeration<String> key1 = sujet.getAttributs().keys();
key1 = nodeStudent.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
}
if(nbAs<=0)reponseStudent = "non";
String reponseSujet = "non";
String reponseStudent = "non";
if(sujet.getNodes().size()>0) reponseSujet="oui";
if(nodeStudent.getNodes().size()>0) reponseStudent="oui";
retour = evaluationEnteteActive(retour,reponseStudent,reponseSujet,sujet.getAttributs().get("evalEnteteActive"),"Entete");
}else {
retour = evaluationEnteteActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalEnteteActive"),"Entete");
String reponseSujet = "non";
if(sujet.getNodes().size()>0) reponseSujet="oui";
retour = evaluationEnteteActive(retour,null, reponseSujet, sujet.getAttributs().get("evalEnteteActive"),"Entete");
}
return retour;
}
@ -529,25 +518,17 @@ public class evaluationAttribut {
*/
private static node evalPiedDePagePasActive(node sujet, node nodeStudent, node retour, String nameElt) {
if(nodeStudent!=null) {
int nbA=0;
int nbAs=0;
String reponseSujet = "oui";
String reponseStudent = "oui";
Enumeration<String> key1 = sujet.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbA++;
}
if(nbA==0) reponseSujet = "non";
key1 = nodeStudent.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
}
if(nbAs==0)reponseStudent = "non";
String reponseSujet = "non";
String reponseStudent = "non";
if(sujet.getNodes().size()==0) reponseSujet="oui";
if(nodeStudent.getNodes().size()==0) reponseStudent="oui";
retour = evaluationPiedPagePasActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
}else {
retour = evaluationPiedPagePasActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
String reponseSujet = "non";
if(sujet.getNodes().size()==0) reponseSujet="oui";
retour = evaluationPiedPagePasActive(retour,null, reponseSujet, sujet.getAttributs().get("evalPiedPagePasActive"),"Pied page");
}
return retour;
}
@ -563,19 +544,16 @@ public class evaluationAttribut {
*/
private static node evalPiedDePageActive(node sujet, node nodeStudent, node retour, String nameElt) {
if(nodeStudent!=null) {
int nbAs=0;
String reponseSujet = "oui";
String reponseStudent = "oui";
Enumeration<String> key1 = sujet.getAttributs().keys();
key1 = nodeStudent.getAttributs().keys();
while(key1.hasMoreElements()) {
String k1 = key1.nextElement();
if(listeAttributsAnalyseWriter.isAttributAnalyseWriter(k1)) nbAs++;
}
if(nbAs<=0)reponseStudent = "non";
String reponseSujet = "non";
String reponseStudent = "non";
if(sujet.getNodes().size()>0) reponseSujet="oui";
if(nodeStudent.getNodes().size()>0) reponseStudent="oui";
retour = evaluationPiedPageActive(retour,reponseStudent,reponseSujet , sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
}else {
retour = evaluationPiedPageActive(retour,null, "Pas trouvé le node de l'étudiant", sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
String reponseSujet = "non";
if(sujet.getNodes().size()>0) reponseSujet="oui";
retour = evaluationPiedPageActive(retour,null, reponseSujet, sujet.getAttributs().get("evalPiedPageActive"),"Pied page");
}
return retour;
}