title: undefined,
xField: undefined,
yFields: [],
- typeGraph: undefined
+ typeGraph: undefined,
+ tipRenderer: undefined,
+ moyenneRenderer: eliot.notes.commun.Utils.getNoteRenderer()
};
+
Ext.apply(cfg, config);
if (cfg.typeGraph == null) {
title: undefined,
xField: undefined,
yFields: [],
- tipRenderer: undefined
+ tipRenderer: undefined,
+ moyenneRenderer: undefined
};
Ext.apply(this.config, config);
tooltip
.attr('x', newX)
.attr('y', newY)
- .text(eliot.notes.commun.Utils.getNoteRenderer()(d[name]))
+ .text(this.config.tipRenderer(d[name]))
.transition(200)
.style('opacity', 1);
})
h: h,
maxValue: 20,
levels: 10,
- tooltypeRenderer: eliot.notes.commun.Utils.getNoteRenderer(),
+ tipRenderer: this.config.tipRenderer,
color: function(i) {
return colors[i];
legende: this.ConfigServeur.libelle.legende
}, this.dataImpressionGraph);
- value.moyenneGeneraleEleve = eliot.notes.commun.Utils.getNoteRenderer()(value.moyenneGeneraleEleve);
- value.moyenneGeneraleClasse = eliot.notes.commun.Utils.getNoteRenderer()(value.moyenneGeneraleClasse);
+ value.moyenneGeneraleEleve = this.config.moyenneRenderer(value.moyenneGeneraleEleve);
+ value.moyenneGeneraleClasse = this.config.moyenneRenderer(value.moyenneGeneraleClasse);
value.moyenneGeneraleEleve = value.moyenneGeneraleEleve != null ? value.moyenneGeneraleEleve : '';
value.moyenneGeneraleClasse = value.moyenneGeneraleClasse != null ? value.moyenneGeneraleClasse : '';
date: ""
}, this.dataImpressionGraph);
- value.moyenneGeneraleEleve = eliot.notes.commun.Utils.getNoteRenderer()(value.moyenneGeneraleEleve);
- value.moyenneGeneraleClasse = eliot.notes.commun.Utils.getNoteRenderer()(value.moyenneGeneraleClasse);
+ value.moyenneGeneraleEleve = this.config.moyenneRenderer(value.moyenneGeneraleEleve);
+ value.moyenneGeneraleClasse = this.config.moyenneRenderer(value.moyenneGeneraleClasse);
value.moyenneGeneraleEleve = value.moyenneGeneraleEleve != null ? value.moyenneGeneraleEleve : '';
value.moyenneGeneraleClasse = value.moyenneGeneraleClasse != null ? value.moyenneGeneraleClasse : '';
ExtraWidthX: 0,
ExtraWidthY: 0,
color: d3.scale.category10(),
- tooltypeRenderer: function(value) {return value}
+ tipRenderer: function(value) {return value}
};
if('undefined' !== typeof options) {
tooltip
.attr('x', newX)
.attr('y', newY)
- .text(cfg.tooltypeRenderer(d.value))
+ .text(cfg.tipRenderer(d.value))
.transition(200)
.style('opacity', 1);
{name: 'noteEleveSur'},
{name: 'noteEleveBase'}
],
- tipRenderer: function(chart, record, index, serie) {
-
- var nom = serie.yField;
-
- var renderer = eliot.notes.commun.Utils.getNoteRenderer({type: 'note'});
-
- if (nom == 'moyenneClasse') {
- renderer = eliot.notes.commun.Utils.noteRenderer;
- }
-
- var noteFormatee = renderer(record.get(nom));
-
- if (record.get(nom + 'Sur') !== 20) {
- var noteBaseFormatee = renderer(record.get(nom + 'Base'));
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee + ' (' + noteBaseFormatee + '/' + record.get(nom + 'Sur') + ')';
- }
- else {
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee;
- }
- }
+ tipRenderer: eliot.notes.commun.Utils.getNoteRenderer({type: 'note'})
});
// Eleve
creeGraphTdn: function() {
- var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note';
-
this.graphTdn = new eliot.notes.consultation.commun.graph.Composant({
prefix: 'tdn',
color: '#96ff96',
colorId: 'max'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
},
{
name: 'noteMin',
color: '#0ff858',
colorId: 'min'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
},
{
name: 'moyenneClasse',
color: '#B20007',
colorId: 'eleve'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
}
],
extraFields: [
{name: 'noteEleveSur'},
{name: 'noteEleveBase'}
],
- tipRenderer: this.getTipRenderer()
+ tipRenderer: eliot.notes.commun.Utils.getNoteRenderer()
});
- },
-
- getTipRenderer : function() {
- var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note'
-
- return function(chart, record, index, serie) {
- var renderer = eliot.notes.commun.Utils.getNoteRenderer({type: typeNote});
-
- var nom = serie.yField;
- if (nom == 'moyenneClasse') {
- renderer = eliot.notes.commun.Utils.noteRenderer;
- }
-
- var noteFormatee = renderer(record.get(nom));
-
- if (record.get(nom + 'Sur') !== 20) {
- var noteBaseFormatee = eliot.notes.commun.Utils.noteRenderer(record.get(nom + 'Base'));
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee + ' (' + noteBaseFormatee + '/' + record.get(nom + 'Sur') + ')';
- }
- else {
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee;
- }
- }
}
-
});
// Construit l'instance singleton
name: 'matiere'
},
yFields: yFields,
- tipRenderer: function(chart, record, index, serie) {
- var nom = serie.yField;
-
- var renderer = eliot.notes.commun.Utils.noteRenderer;
- if ((nom == 'noteMax') || (nom == 'noteMin')) {
- renderer = eliot.notes.commun.Utils.getNoteRenderer({type: 'note'});
- }
-
- var noteFormatee = renderer(record.get(nom));
- return serie.displayName + '\n' +
- record.get('matiere') + '\n' +
- noteFormatee;
- }
+ tipRenderer: eliot.notes.commun.Utils.getNoteRenderer()
});
this.graph = graph;
creeGraphTdn: function() {
- var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note';
-
this.graphTdn = new eliot.notes.consultation.commun.graph.Composant({
prefix: 'tdn',
color: '#96ff96',
colorId: 'max'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
},
{
name: 'noteMin',
color: '#0ff858',
colorId: 'min'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
},
{
name: 'moyenneClasse',
color: '#B20007',
colorId: 'eleve'
},
- round: eliot.notes.commun.Utils.getNoteRound({type: typeNote})
+ round: eliot.notes.commun.Utils.getNoteRound()
}
],
extraFields: [
});
},
- getTipRenderer : function() {
- var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note'
-
- return function(chart, record, index, serie) {
- var renderer = eliot.notes.commun.Utils.getNoteRenderer({type: typeNote});
-
- var nom = serie.yField;
- if (nom == 'moyenneClasse') {
- renderer = eliot.notes.commun.Utils.noteRenderer;
- }
-
- var noteFormatee = renderer(record.get(nom));
-
- if (record.get(nom + 'Sur') !== 20) {
- var noteBaseFormatee = eliot.notes.commun.Utils.noteRenderer(record.get(nom + 'Base'));
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee + ' (' + noteBaseFormatee + '/' + record.get(nom + 'Sur') + ')';
- }
- else {
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee;
- }
- }
- }
+ getTipRenderer: eliot.notes.commun.Utils.getNoteRenderer()
});
// Construit l'instance singleton
name: 'matiere'
},
yFields: yFields,
- tipRenderer: function(chart, record, index, serie) {
- var nom = serie.yField;
-
- var renderer = eliot.notes.commun.Utils.noteRenderer;
- if ((nom == 'noteMax') || (nom == 'noteMin')) {
- renderer = eliot.notes.commun.Utils.getNoteRenderer({type: 'note'});
- }
-
- var noteFormatee = renderer(record.get(nom));
- return serie.displayName + '\n' +
- record.get('matiere') + '\n' +
- noteFormatee;
- }
+ tipRenderer: eliot.notes.commun.Utils.getNoteRenderer()
});
this.graph = graph;
},
getTipRenderer : function() {
- var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note'
-
- return function(chart, record, index, serie) {
- var renderer = eliot.notes.commun.Utils.getNoteRenderer({type: typeNote});
-
- var nom = serie.yField;
- if (nom == 'moyenneClasse') {
- renderer = eliot.notes.commun.Utils.noteRenderer;
- }
-
- var noteFormatee = renderer(record.get(nom));
-
- if (record.get(nom + 'Sur') !== 20) {
- var noteBaseFormatee = eliot.notes.commun.Utils.noteRenderer(record.get(nom + 'Base'));
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee + ' (' + noteBaseFormatee + '/' + record.get(nom + 'Sur') + ')';
- }
- else {
- return serie.displayName + '\n' +
- record.get('evaluation') + '\n' +
- noteFormatee;
- }
- }
+ var typeNote = this.ConfigServeur.data.isPeriodeAnnee ? 'moyenne' : 'note';
+ return eliot.notes.commun.Utils.getNoteRenderer({type: typeNote});
},
creeImpressionItems: function() {