NotesFonctionnalite.NOTES_SAISIE_NOTES_ENSEIGNANTS
])
- // Si l'enseignantId est null on considère que l'neseignant est la pesonne connecté
+ // Si l'enseignantId est null on considère que l'enseignant est la personne connectée
Autorite enseignant = params.enseignantId ?
Autorite.get(params.enseignantId) :
securiteSession.defaultAutorite
tdnGraph.getComposantModele(false)
}
+
render result as JSON
}
<g:setJsValueJson name="impressionGraph" value="${impressionGraph}"/>
<g:setJsValueJson name="couleurs" value="${couleurs}"/>
+ // Icônes
+ <g:setJsVar value="ConfigServeur.icon"/>
+ <g:setJsValueResource name="graphEtoile" dir="images" file="graph_etoile.png"/>
+ <g:setJsValueResource name="graphEleveClasseCompare" dir="images" file="graph_bar_courbe.png"/>
+ <g:setJsValueResource name="graphEvolutionAnnee" dir="images" file="graph_bar.png"/>
+
</g:javascript>
<g:javascript library="src/views/Messages"/>
<g:setJsValueMessage name="appreciationEnregistreEchou" code="eliot.notes.message.appreciationEnregistreEchou"/>
<g:setJsValueMessage name="appreciationEnregistreEnCours" code="eliot.notes.message.appreciationEnregistreEnCours"/>
<g:setJsValueMessage name="ajoutAppreciationDansListe" code="eliot.notes.message.ajoutAppreciationDansListe"/>
+ <g:setJsValueMessage name="tblNotesGraphEchou" code="eliot.notes.message.erreurInconnue"/>
// Url
<g:setJsVar value="ConfigServeur.url"/>
<g:setJsValueLink name="appreciationsEleve" controller="saisieAppreciations" action="appreciationsEleve"/>
<g:setJsValueLink name="enregistreAppreciations" controller="saisieAppreciations" action="enregistreAppreciation"/>
+ <g:setJsValueLink name="urlGraphTblNotes" controller="saisieTableauDeNotes" action="graph"/>
// Libellés
<g:setJsVar value="ConfigServeur.libelle"/>
<g:setJsValueMessage name="recapitulatifAnnuel" code="eliot.notes.libelle.recapitulatifAnnuel"/>
<g:setJsValueMessage name="detailDesNotes" code="eliot.notes.libelle.detailDesNotes"/>
+ <g:setJsValueMessage name="imprimer" code="eliot.notes.libelle.imprimer"/>
+
// Icônes
<g:setJsVar value="ConfigServeur.icon"/>
<g:setJsValueResource name="banqueAppreciationEnregistrer" dir="images/skin" file="database_right.png"/>
<g:setJsValueMessage name="bulletin" code="eliot.notes.libelle.bulletin"/>
<g:setJsValueMessage name="graph" code="eliot.notes.libelle.graph"/>
- <g:setJsValueMessage name="graphEtoile" code="eliot.notes.libelle.graphEtoile"/>
- <g:setJsValueMessage name="graphEleveClasseCompare" code="eliot.notes.libelle.graphEleveClasseCompare"/>
- <g:setJsValueMessage name="graphEvolutionAnnee" code="eliot.notes.libelle.graphEvolutionAnnee"/>
-
<g:setJsValueMessage name="imprimer" code="eliot.notes.libelle.imprimer"/>
<g:setJsValueMessage name="fermer" code="eliot.notes.libelle.fermer"/>
<g:setJsValueMessage name="noteEleve" code="eliot.notes.libelle.noteEleve"/>
- <g:setJsValueMessage name="enregistrer" code="eliot.notes.libelle.enregistrer"/>;
+ <g:setJsValueMessage name="enregistrer" code="eliot.notes.libelle.enregistrer"/>
<g:setJsValueMessage name="ok" code="eliot.notes.libelle.ok"/>
<g:setJsValueMessage name="annuler" code="eliot.notes.libelle.annuler"/>
<g:setJsValueResource name="precedent" dir="images" file="arrow_left.png"/>
<g:setJsValueResource name="suivant" dir="images" file="arrow_right.png"/>
- <g:setJsValueResource name="graphEtoile" dir="images" file="graph_etoile.png"/>
- <g:setJsValueResource name="graphEleveClasseCompare" dir="images" file="graph_bar_courbe.png"/>
- <g:setJsValueResource name="graphEvolutionAnnee" dir="images" file="graph_bar.png"/>
-
// Data
<g:setJsVar value="ConfigServeur.data"/>
<g:setJsValueJson name="listeStructureEnseignements" value="${classes}"/>
<g:setJsValueJson name="eleves" value="${eleves}"/>
<g:setJsValueNumeric name="eleveSelectionneId" value="${eleveId}"/>
- <g:setJsValueJson name="data" value="${data}"/>
- <g:setJsValueJson name="impressionGraph" value="${impressionGraph}"/>
- <g:setJsValueJson name="periodesPrecedentesExistent" value="${periodesPrecedentesExistent}"/>
- <g:setJsValueJson name="graphPeriodes" value="${graphPeriodes}"/>
-
<g:setJsValueJson name="periodes" value="${periodes}"/>
<g:setJsValueNumeric name="periodeSelectionneeId" value="${periodeId}"/>
<g:setJsValueBoolean name="verrouille" value="${verrouille}"/>
<g:setJsValueBoolean name="isPeriodeAnnee" value="${isPeriodeAnnee}"/>
+ // Pour Graph
+ <g:setJsValueJson name="periodesPrecedentesExistent" value="${periodesPrecedentesExistent}"/>
+ <g:setJsValueJson name="graphPeriodes" value="${graphPeriodes}"/>
+
</g:javascript>
<g:javascript library="src/views/Messages"/>
eliot.notes.saisie.synthese.Modele.libelle.vueEleve = '${g.message(code: "notes.menu.saisie.conseilDeClasse.vueEleve.titrePrincipal")?.encodeAsJavaScript()}';
eliot.notes.saisie.synthese.Modele.libelle.elevesArchives = '${g.message(code: "notes.menu.saisie.elevesArchives")?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.libelle.graphEtoile= '${g.message(code: "eliot.notes.libelle.graphEtoile")?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.libelle.graphEleveClasseCompare= '${g.message(code: "eliot.notes.libelle.graphEleveClasseCompare")?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.libelle.graphEvolutionAnnee= '${g.message(code: "eliot.notes.libelle.graphEvolutionAnnee")?.encodeAsJavaScript()}';
-
-
eliot.notes.saisie.synthese.Modele.messages.appreciationModifieEnCours = '${g.message(code: "eliot.notes.message.appreciationModifieEnCours")?.encodeAsJavaScript()}';
eliot.notes.saisie.synthese.Modele.messages.appreciationModifieSucces = '${g.message(code: "eliot.notes.message.appreciationModifieSucces")?.encodeAsJavaScript()}';
eliot.notes.saisie.synthese.Modele.messages.appreciationModifieEchou = '${g.message(code: "eliot.notes.message.appreciationModifieEchou")?.encodeAsJavaScript()}';
eliot.notes.saisie.synthese.Modele.icon.appreciationClasse = '${resource(dir: 'images/skin', file: 'database_edit.png')}';
eliot.notes.saisie.synthese.Modele.icon.graph = '${resource(dir: 'images', file: 'graph.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.icon.graphEtoile = '${resource(dir: 'images', file: 'graph_etoile.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.icon.graphEleveClasseCompare = '${resource(dir: 'images', file: 'graph_bar_courbe.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.synthese.Modele.icon.graphEvolutionAnnee = '${resource(dir: 'images', file: 'graph_bar.png')?.encodeAsJavaScript()}';
-
eliot.notes.saisie.synthese.Modele.data.periodeId = '${periodeId}';
eliot.notes.saisie.synthese.Modele.data.classeId = '${classeId}';
eliot.notes.saisie.synthese.Modele.data.appreciationModifiable = ${appreciationModifiable ?: false};
eliot.notes.saisie.tableauDeNotes.Modele.libelle.notesEtMoyennes= '${g.message(code: "eliot.notes.libelle.notesEtMoyennes")?.encodeAsJavaScript()}';
eliot.notes.saisie.tableauDeNotes.Modele.libelle.appreciations= '${g.message(code: "eliot.notes.libelle.appreciations")?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.libelle.graphEtoile= '${g.message(code: "eliot.notes.libelle.graphEtoile")?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.libelle.graphEleveClasseCompare= '${g.message(code: "eliot.notes.libelle.graphEleveClasseCompare")?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.libelle.graphEvolutionAnnee= '${g.message(code: "eliot.notes.libelle.graphEvolutionAnnee")?.encodeAsJavaScript()}';
-
eliot.notes.saisie.tableauDeNotes.Modele.url.getSaisieTableauDeNotesCsv = '${createLink(controller: 'saisieTableauDeNotes', action: 'getTableauDeNotesCsv')}';
eliot.notes.saisie.tableauDeNotes.Modele.url.getConsultationTableauDeNotesCsv = '${createLink(controller: 'consultationTableauDeNotes', action: 'getTableauDeNotesCsv')}';
eliot.notes.saisie.tableauDeNotes.Modele.url.urlListeService = '${createLink(controller: 'service', action: 'listeServicesPourEnseignant')}';
eliot.notes.saisie.tableauDeNotes.Modele.icon.appreciations = '${resource(dir: 'images/skin', file: 'database_edit.png')?.encodeAsJavaScript()}';
eliot.notes.saisie.tableauDeNotes.Modele.icon.graph = '${resource(dir: 'images', file: 'graph.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.icon.graphEtoile = '${resource(dir: 'images', file: 'graph_etoile.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.icon.graphEleveClasseCompare = '${resource(dir: 'images', file: 'graph_bar_courbe.png')?.encodeAsJavaScript()}';
- eliot.notes.saisie.tableauDeNotes.Modele.icon.graphEvolutionAnnee = '${resource(dir: 'images', file: 'graph_bar.png')?.encodeAsJavaScript()}';
-
eliot.notes.saisie.tableauDeNotes.Modele.messages.tblNotesModifieEnCours = '${g.message(code: "eliot.notes.message.tblNotesModifieEnCours")?.encodeAsJavaScript()}';
eliot.notes.saisie.tableauDeNotes.Modele.messages.tblNotesModifieSucces = '${g.message(code: "eliot.notes.message.tblNotesModifieSucces")?.encodeAsJavaScript()}';
eliot.notes.saisie.tableauDeNotes.Modele.messages.tblNotesModifieEchou = '${g.message(code: "eliot.notes.message.tblNotesModifieEchou")?.encodeAsJavaScript()}';
},
icon: {
-
+ graphEtoile: undefined,
+ graphEleveClasseCompare: undefined,
+ graphEvolutionAnnee: undefined
},
data: {
eleveSelectionneId: undefined,
periodeSelectionneeId: undefined,
- data: []
+ data: [],
+ impressionGraph: undefined
},
couleurs: {}
this.ns = eliot.notes.saisie.appreciations;
this.ConfigServeur = this.ns.ConfigServeur;
this.Constantes = this.ns.Constantes;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
// Banque d'appréciation
this.banqueAppreciation = new eliot.notes.saisie.commun.banqueAppreciation.Composant();
this.banqueAppreciation.disable();
- // Graph
- this.graph = new eliot.notes.consultation.commun.graph.Composant({
- xField: {
- name: 'evaluation'
- },
- yFields: [
- {
- name: 'noteMax',
- type: 'column',
- libelle: this.ConfigServeur.libelle.noteMaxMoyenneClasse,
- style: {
- color: 0x96ff96
- },
- round: eliot.notes.commun.Utils.getNoteRound({type: 'note'})
- },
- {
- name: 'noteMin',
- type: 'column',
- libelle: this.ConfigServeur.libelle.noteMinMoyenneClasse,
- style: {
- color: 0xff8585
- },
- round: eliot.notes.commun.Utils.getNoteRound({type: 'note'})
- },
- {
- name: 'moyenneClasse',
- type: 'line',
- libelle: this.ConfigServeur.libelle.moyenneClasse,
- style: {
- color: 0x15428B
- },
- round: eliot.notes.commun.Utils.noteRound
- },
- {
- name: 'noteEleve',
- type: 'line',
- libelle: this.ConfigServeur.libelle.noteEleve,
- style: {
- color: 0xB20007
- },
- round: eliot.notes.commun.Utils.getNoteRound({type: 'note'})
- }
- ],
- extraFields: [
- {name: 'noteMaxSur'},
- {name: 'noteMaxBase'},
- {name: 'noteMinSur'},
- {name: 'noteMinBase'},
- {name: 'moyenneClasseSur'},
- {name: 'moyenneClasseBase'},
- {name: 'noteEleveSur'},
- {name: 'noteEleveBase'}
- ],
- tipRenderer: eliot.notes.commun.Utils.getNoteRenderer({type: 'note'})
- });
-
// Eleve
this.eleveModel = new this.ns.EleveModel();
this.eleveController = new this.ns.EleveController(this.eleveModel);
this.appreciationsController.observeToolbarView(this.toolbarView);
this.appreciationsController.observeView(this.appreciationsView);
this.toolbarView.observeAppreciationView(this.appreciationsView);
+ this.appreciationsView.observeController(this.appreciationsController);
+
+ var appreciationsView = this.appreciationsView;
var centerRegionItems = [
{
border: false,
frame: false,
layout: 'fit',
- items: this.appreciationsView.items
+ items: appreciationsView.items
}
]
- }
- //TODO activer lors de correction de la fiche 0040730
- /*,
+ },
{
title: this.ConfigServeur.libelle.graph,
xtype: 'panel',
border: false,
frame: false,
autoScroll: true,
- hidden: true,
+ layout: 'border',
+ items: [
+ {
+ border: false,
+ frame: false,
+ layout: 'border',
+ region: 'center',
+ items: [
+ {
+ border: false,
+ frame: false,
+ region: 'center',
+ layout: 'fit',
+
+ items: [
+ appreciationsView.graphPanel
+ ]
+ },
+ {
+ region: 'east',
+ xtype: 'panel',
+
+ border: false,
+ frame : false,
+ layout: 'border',
+ split: true,
+ width: 200,
+ minSize: 20,
+ collapseMode: 'mini',
+
+ items: [
+ {
+ region: 'center',
+ border: false,
+ frame : false,
+ layout : 'fit',
+ items: [
+ appreciationsView.graphLegendPanel
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'toolbar',
+ region: 'south',
+ buttonAlign: 'left',
+ height: 30,
+ items: [
+ {
+ icon: this.ConfigServeurGraph.icon.graphEtoile,
+ tooltip: this.ConfigServeurGraph.libelle.graphEtoile,
+ toggleGroup: 'graph',
+ allowDepress: false,
+ pressed: true,
+ handler: function() {
+ appreciationsView.graph.typeGraph = appreciationsView.graph.Constantes.type.graph.etoile;
+ appreciationsView.fireEvent(appreciationsView.Constantes.eventId.actionActualiserGraph);
+ }
+ },
+ {
+ icon: this.ConfigServeurGraph.icon.graphEleveClasseCompare,
+ tooltip: this.ConfigServeurGraph.libelle.graphEleveClasseCompare,
+ toggleGroup: 'graph',
+ allowDepress: false,
+ handler: function() {
+ appreciationsView.graph.typeGraph = appreciationsView.graph.Constantes.type.graph.eleveClasseCompare;
+ appreciationsView.fireEvent(appreciationsView.Constantes.eventId.actionActualiserGraph);
+ }
+ },
+ '->',
+ {
+ text: this.ConfigServeur.libelle.imprimer,
+ handler: function() {
+ appreciationsView.graph.imprime();
+ }
+ }
+ ]
+ }
+ ]
+ }
- items: this.graph.items
- }*/
]
})
]
});
- }
+ },
+ getTipRenderer : function() {
+ var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note';
+ return eliot.notes.commun.Utils.getNoteRenderer({type: typeNote});
+ }
});
// Construit l'instance singleton
this.ConfigServeur = this.ns.ConfigServeur;
this.Constantes = this.ns.Constantes;
+ this.addEvents(
+ /**
+ * Demande l'actualisation du graph
+ */
+ this.Constantes.eventId.actionActualiserGraph
+ );
+
// Définition de la configuration par défaut
var cfg = {
eleveModel: undefined,
this.recharge(eleve);
},
this
- );
+ );
},
this.banqueAppreciation.creeAppreciation(data);
},
this);
+
+ view.addListener(
+ this.Constantes.eventId.actionActualiserGraph,
+ function() {
+ this.rechargeGraph();
+ },
+ this);
},
+ /**
+ * Ouvrir le graph
+ */
+ rechargeGraph: function() {
+
+ eliot.commun.AjaxHelper.request({
+
+ url: this.ConfigServeur.url.urlGraphTblNotes,
+
+ params: {
+ eleveId: this.eleveModel.getEleve().get('eleveId'),
+ typePeriodeId: this.ConfigServeur.data.typePeriodeSelectionneId,
+ serviceId: this.ConfigServeur.data.serviceSelectionneId
+ },
+
+ success: function(reponse, request) {
+ if (reponse.success != true) {
+ if (reponse.errorMsg) {
+ eliot.notes.Messages.showErreur(reponse.errorMsg);
+ }
+ else {
+ request.failure.call(this);
+ }
+ }
+ else {
+ this.fireEvent(
+ this.Constantes.eventId.actionActualiserGraph,
+ reponse.data,
+ reponse.impressionGraph);
+ }
+ },
+ failure: function() {
+ eliot.notes.Messages.showErreur(
+ this.ConfigServeur.messages.tblNotesGraphEchou
+ );
+
+ this.fireEvent(this.Constantes.eventId.actionActualiserGraph, [], []);
+ },
+ scope: this
+ });
+ },
+
+
/**
* Observe la toolbar
* @param view
/**
* Affiche les appréciations
*/
- affiche: function(appreciation, verrouille, actif, tableauRecap, graphData, detailsNotes) {
+ affiche: function(appreciation, verrouille, actif, tableauRecap, detailsNotes) {
this.storeSaisie.loadData({
saisie: [
tableauRecap: []
});
}
-
- this.graph.afficheGraph(graphData);
},
/**
reponse.verrouille,
reponse.actif,
reponse.tableauRecap,
- reponse.data,
reponse.detailsNotes
);
- },
+
+ this.rechargeGraph();
+ },
failure: function(reponse) {
if ((reponse.message !== undefined) && (reponse.message !== '')) {
Ext.QuickTips.init();
this.tooltipSequence = 0;
- this.renderedTooltips = [];
+ this.renderedTooltips = [];
this.ns = eliot.notes.saisie.appreciations;
this.ConfigServeur = this.ns.ConfigServeur;
this.Constantes = this.ns.Constantes;
this.Utils = eliot.notes.commun.Utils;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
this.addEvents(
- /**
- * Changement dans la saisie
- * @event saisieChange
- * @param valide
- */
+ /**
+ * Changement dans la saisie
+ * @event saisieChange
+ * @param valide
+ */
this.Constantes.eventId.saisieChange,
- /**
- * Ajoute une appréciation
- * @appreciation
- */
- this.Constantes.eventId.actionInsereAppreciation
+ /**
+ * Ajoute une appréciation
+ * @appreciation
+ */
+ this.Constantes.eventId.actionInsereAppreciation,
- );
+
+ /**
+ * Demande l'actualisation du graph
+ */
+ this.Constantes.eventId.actionActualiserGraph
+ );
// Définition de la configuration par défaut
var cfg = {
this.observeStoreSaisie();
this.observeBanqueAppreciation();
-
+ this.initGraphCompnents();
},
/**
}
},
scope: this
- }
+ };
// Ajoute les listeners qui gèrent la touche "Entrée"
Ext.apply(listeners,eliot.notes.commun.Utils.getTextAreaCommunListeners(this));
click: function() {
this.fireEvent(
this.Constantes.eventId.actionInsereAppreciation,
- {
- texte: this.appreciationTextArea.getValue()
- });
+ {
+ texte: this.appreciationTextArea.getValue()
+ });
},
scope: this
},
width: 50,
align: 'center',
renderer: eliot.notes.commun.Utils.getNoteRenderer({
- bold: true,
- annotationRenderer: function(value) {
- var sequence = view.tooltipSequence;
- view.tooltipSequence ++;
- return '<span id="annotation' + sequence
- + '"class="annotation" annotation="' + value + '">'
- + value + '</span>';
- }
- })
+ bold: true,
+ annotationRenderer: function(value) {
+ var sequence = view.tooltipSequence;
+ view.tooltipSequence ++;
+ return '<span id="annotation' + sequence
+ + '"class="annotation" annotation="' + value + '">'
+ + value + '</span>';
+ }
+ })
});
}, this);
var view = this;
columns.push(
- // Moy. Elève
+ // Moy. Elève
{
header: '<span style="white-space:normal">' + this.ConfigServeur.libelle.moyenneEleve + '</span>',
dataIndex: 'moyenneEleve',
width: 50,
align: 'center',
renderer: eliot.notes.commun.Utils.getNoteRenderer({
- bold: true,
- annotationRenderer: function(value) {
- var sequence = view.tooltipSequence;
- view.tooltipSequence ++;
- return '<span id="annotation' + sequence
- + '"class="annotation" annotation="' + value + '">'
- + value + '</span>';
- }
- })
+ bold: true,
+ annotationRenderer: function(value) {
+ var sequence = view.tooltipSequence;
+ view.tooltipSequence ++;
+ return '<span id="annotation' + sequence
+ + '"class="annotation" annotation="' + value + '">'
+ + value + '</span>';
+ }
+ })
},
- // Moy. Classe
+ // Moy. Classe
{
header: '<span style="white-space:normal">' + this.ConfigServeur.libelle.moyenneClasse + '</span>',
dataIndex: 'moyenneClasse',
renderer: eliot.notes.commun.Utils.noteRendererBold
},
- // Appréciations
+ // Appréciations
{
header: this.ConfigServeur.libelle.appreciation,
dataIndex: 'appreciation',
});
},
+ /**
+ * Créer les composants utilisés pour le graph
+ */
+ initGraphCompnents: function() {
+
+ this.graphPanel = new Ext.Panel({
+ region:'center',
+ border: false,
+ frame: false,
+ layout: 'fit',
+ items: []
+ });
+
+ this.graphLegendPanel = new Ext.Panel({
+ border: false,
+ frame: false,
+ layout: 'fit',
+ items: []
+ });
+
+ if (this.ConfigServeurGraph.data.data.length !== 0) {
+ this.afficheGraph(
+ this.ConfigServeurGraph.data.data,
+ this.ConfigServeurGraph.impressionGraph
+ );
+ }
+ },
+
+ afficheGraph: function(data, dataImpressionGraph) {
+
+ this.graphPanel.removeAll(true);
+ this.graphLegendPanel.removeAll(true);
+
+ var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note';
+
+ // Graph
+ var graph = new eliot.notes.consultation.commun.graph.Composant({
+
+ dataFilter: function(data) {
+ return data.noteEleve != null;
+ },
+
+ typeGraph: this.graph != null ? this.graph.typeGraph : undefined,
+
+ xField: {
+ name: 'evaluation'
+ },
+ yFields: [
+ {
+ name: 'noteMax',
+ type: 'column',
+ libelle: this.ConfigServeur.libelle.noteMaxMoyenneClasse,
+ style: {
+ color: '#96ff96',
+ colorId: 'max'
+ },
+ round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ },
+ {
+ name: 'noteMin',
+ type: 'column',
+ libelle: this.ConfigServeur.libelle.noteMinMoyenneClasse,
+ style: {
+ color: '#0ff858',
+ colorId: 'min'
+ },
+ round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ },
+ {
+ name: 'moyenneClasse',
+ type: 'line',
+ libelle: this.ConfigServeur.libelle.moyenneClasse,
+ style: {
+ color: '#15428B',
+ colorId: 'classe'
+ },
+ round: eliot.notes.commun.Utils.noteRound
+ },
+ {
+ name: 'noteEleve',
+ type: 'line',
+ libelle: this.ConfigServeur.libelle.noteEleve,
+ style: {
+ color: '#B20007',
+ colorId: 'eleve'
+ },
+ round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ }
+ ],
+ extraFields: [
+ {name: 'noteMaxSur'},
+ {name: 'noteMaxBase'},
+ {name: 'noteMinSur'},
+ {name: 'noteMinBase'},
+ {name: 'moyenneClasseSur'},
+ {name: 'moyenneClasseBase'},
+ {name: 'noteEleveSur'},
+ {name: 'noteEleveBase'}
+ ],
+
+ tipRenderer: eliot.notes.commun.Utils.getNoteRenderer({type: typeNote})
+ });
+
+ this.graph = graph;
+
+ this.graphLegendPanel.add(graph.getLegendItem());
+ this.graphPanel.add(graph.getItems());
+
+ this.graphLegendPanel.doLayout();
+ this.graphPanel.doLayout();
+
+ graph.afficheGraph(data, dataImpressionGraph);
+ },
+
+ observeController: function(controller) {
+ controller.addListener(
+ this.Constantes.eventId.actionActualiserGraph,
+ function(data, dataImpressionGraph) {
+ this.afficheGraph(data, dataImpressionGraph);
+ },
+ this);
+ },
+
/**
* Item principal
*/
this.addTooltips();
var task = new Ext.util.DelayedTask(
- function(){
- this.addTooltips();
- },
- this);
+ function(){
+ this.addTooltips();
+ },
+ this);
task.delay(1);
},
appreciationEnregistreEchou: undefined,
appreciationEnregistreEnCours: undefined,
- ajoutAppreciationDansListe: undefined
+ ajoutAppreciationDansListe: undefined,
+ tblNotesGraphEchou: undefined
},
url:{
appreciationsEleve: undefined,
- enregistreAppreciations: undefined
+ enregistreAppreciations: undefined,
+
+ urlGraphTblNotes: undefined
},
libelle: {
periode: undefined,
moyenneEleve: undefined,
- moyenneClasse: undefined,
appreciation: undefined,
moyenne: undefined,
annuler: undefined,
precedent: undefined,
- suivant: undefined
+ suivant: undefined,
+
+ imprimer: undefined
},
data: {
actionElevePrecedent: 'actionElevePrecedent',
actionEleveSuivant: 'actionEleveSuivant',
- listeEleveChange: 'listeEleveChange'
+ listeEleveChange: 'listeEleveChange',
+ actionActualiserGraph: 'actionActualiserGraph'
},
composantId: {
this.ConfigServeur = this.ns.ConfigServeur;
this.Constantes = this.ns.Constantes;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
// Evènements
this.addEvents(
height: 30,
items: [
{
- icon: this.ConfigServeur.icon.graphEtoile,
- tooltip: this.ConfigServeur.libelle.graphEtoile,
+ icon: this.ConfigServeurGraph.icon.graphEtoile,
+ tooltip: this.ConfigServeurGraph.libelle.graphEtoile,
toggleGroup: 'graph',
allowDepress: false,
pressed: true,
}
},
{
- icon: this.ConfigServeur.icon.graphEleveClasseCompare,
- tooltip: this.ConfigServeur.libelle.graphEleveClasseCompare,
+ icon: this.ConfigServeurGraph.icon.graphEleveClasseCompare,
+ tooltip: this.ConfigServeurGraph.libelle.graphEleveClasseCompare,
toggleGroup: 'graph',
allowDepress: false,
handler: function() {
}
},
{
- icon: this.ConfigServeur.icon.graphEvolutionAnnee,
- tooltip: this.ConfigServeur.libelle.graphEvolutionAnnee,
+ icon: this.ConfigServeurGraph.icon.graphEvolutionAnnee,
+ tooltip: this.ConfigServeurGraph.libelle.graphEvolutionAnnee,
toggleGroup: 'graph',
allowDepress: false,
handler: function() {
imprimer : undefined,
fermer: undefined,
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined,
bulletinOptionsChoixConseil: undefined,
selClassesAModifier: undefined //'Sélection des classes à modifier'
},
annuler: undefined,
precedent: undefined,
- suivant: undefined,
-
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined
+ suivant: undefined
},
data: {
isPeriodeAnnee: undefined,
- impressionGraph: undefined,
periodesPrecedentesExistent: undefined
}
};
\ No newline at end of file
this.ns = eliot.notes.saisie.conseilDeClasse;
this.ConfigServeur = this.ns.ConfigServeur;
this.Constantes = this.ns.Constantes;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
this.addEvents(
items: []
});
- if (this.ConfigServeur.data.data.length !== 0) {
+ if (this.ConfigServeurGraph.data.data.length !== 0) {
this.afficheGraph(
- this.ConfigServeur.data.data,
- this.ConfigServeur.data.impressionGraph,
+ this.ConfigServeurGraph.data.data,
+ this.ConfigServeurGraph.data.impressionGraph,
this.ConfigServeur.data.periodesPrecedentesExistent,
this.ConfigServeur.data.graphPeriodes);
}
-
},
/**
break;
}
}
-
return filter;
}
-
return true;
},
typeGraph: this.graph != null ? this.graph.typeGraph : undefined,
+
xField: {
name: 'matiere'
},
+
yFields: yFields,
tipRenderer: eliot.notes.commun.Utils.getNoteRenderer()
});
+
this.graph = graph;
+ this.graphLegendPanel.add(graph.getLegendItem());
this.graphPanel.add(graph.getItems());
- this.graphPanel.doLayout();
- this.graphLegendPanel.add(graph.getLegendItem());
this.graphLegendPanel.doLayout();
+ this.graphPanel.doLayout();
if (periodesPrecedentesExistent === true) {
this.periodesPrecedentesCheckbox.show();
color: '#96ff96',
colorId: 'max'
},
- round: eliot.notes.commun.Utils.getNoteRound()
+ round: eliot.notes.commun.Utils.noteRound
},
{
name: 'noteMin',
color: '#0ff858',
colorId: 'min'
},
- round: eliot.notes.commun.Utils.getNoteRound()
+ round: eliot.notes.commun.Utils.noteRound
},
{
name: 'moyenneClasse',
color: '#B20007',
colorId: 'eleve'
},
- round: eliot.notes.commun.Utils.getNoteRound()
+ round: eliot.notes.commun.Utils.noteRound
}
],
extraFields: [
graph: undefined,
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined,
-
imprimer : undefined,
fermer: undefined,
conseilDeClasse: undefined,
appreciationClasse: undefined,
imprimer : undefined,
- graph: undefined,
-
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined
+ graph: undefined
},
data: {
this.ns = eliot.notes.saisie.synthese;
this.ConfigServeur = this.ns.Modele;
this.Constantes = this.ns.Constantes;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
this.addEvents(
/**
buttonAlign: 'left',
buttons: [
{
- icon: this.ConfigServeur.icon.graphEtoile,
- tooltip: this.ConfigServeur.libelle.graphEtoile,
+ icon: this.ConfigServeurGraph.icon.graphEtoile,
+ tooltip: this.ConfigServeurGraph.libelle.graphEtoile,
toggleGroup: 'graph',
allowDepress: false,
pressed: true,
}
},
{
- icon: this.ConfigServeur.icon.graphEleveClasseCompare,
- tooltip: this.ConfigServeur.libelle.graphEleveClasseCompare,
+ icon: this.ConfigServeurGraph.icon.graphEleveClasseCompare,
+ tooltip: this.ConfigServeurGraph.libelle.graphEleveClasseCompare,
toggleGroup: 'graph',
allowDepress: false,
handler: function() {
}
},
{
- icon: this.ConfigServeur.icon.graphEvolutionAnnee,
- tooltip: this.ConfigServeur.libelle.graphEvolutionAnnee,
+ icon: this.ConfigServeurGraph.icon.graphEvolutionAnnee,
+ tooltip: this.ConfigServeurGraph.libelle.graphEvolutionAnnee,
toggleGroup: 'graph',
allowDepress: false,
handler: function() {
color: '#96ff96',
colorId: 'max'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: 'note'})
+ round: eliot.notes.commun.Utils.noteRound
},
{
name: 'noteMin',
color: '#ff8585',
colorId: 'min'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: 'note'})
+ round: eliot.notes.commun.Utils.noteRound
},
{
name: 'moyenneClasse',
ok: undefined,
notesEtMoyennes: undefined,
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined,
-
moyenneCourt: undefined,
auto: undefined,
finale: undefined
imprimer : undefined,
devoirnonpublie: undefined,
graph: undefined,
- graphEtoile: undefined,
- graphEleveClasseCompare: undefined,
- graphEvolutionAnnee: undefined,
noteMaxMoyenneClasse: undefined,
noteMinMoyenneClasse: undefined,
}
};
-eliot.notes.saisie.tableauDeNotes.ConfigServeur =
- eliot.notes.saisie.tableauDeNotes.Modele;
\ No newline at end of file
+eliot.notes.saisie.tableauDeNotes.ConfigServeur = eliot.notes.saisie.tableauDeNotes.Modele;
\ No newline at end of file
this.ns = eliot.notes.saisie.tableauDeNotes;
this.Constantes = this.ns.Constantes;
this.ConfigServeur = this.ns.Modele;
+ this.ConfigServeurGraph = eliot.notes.consultation.commun.graph.ConfigServeur;
+
this.addEvents(
/**
buttonAlign: 'left',
buttons: [
{
- icon: this.ConfigServeur.icon.graphEtoile,
- tooltip: this.ConfigServeur.libelle.graphEtoile,
+ icon: this.ConfigServeurGraph.icon.graphEtoile,
+ tooltip: this.ConfigServeurGraph.libelle.graphEtoile,
toggleGroup: 'graph',
allowDepress: false,
pressed: true,
}
},
{
- icon: this.ConfigServeur.icon.graphEleveClasseCompare,
- tooltip: this.ConfigServeur.libelle.graphEleveClasseCompare,
+ icon: this.ConfigServeurGraph.icon.graphEleveClasseCompare,
+ tooltip: this.ConfigServeurGraph.libelle.graphEleveClasseCompare,
toggleGroup: 'graph',
allowDepress: false,
handler: function() {