Remaster (#38)
* setup new 'statistiques' module * added 'graphos' package and created first test graph * put graphos in requirements, deleted local folder * added "load_csv" management command ! * added update of premiere_rencontre field in 'load_csv' management command * added missing urls.py file * added 'merge' action and view * added 'info_completed' ratio * linked sujets:merge views inside suivi:details * added link to maraudes:details in notes table headers, if any * Major reorganisation, moved 'suivi' and 'sujets' to 'notes', cleanup in 'maraudes', dropping 'website' mixins (mostly useless) * small cleanup * worked on Maraude and Sujet lists * corrected missing line in notes.__init__ * restored 'details' view for maraudes and sujets insie 'notes' module * worked on 'notes': added navigation between maraude's compte-rendu, right content in details, header to list tables * changed queryset for CompteRenduDetailsView to all notes of same date, minor layout changes * added right content to 'details-sujet', created 'statistiques' view and update templates * restored 'statistiques' ajax view in 'details-sujet', fixed 'merge_two' util function * added auto-creation of FicheStatistique (plus some tests), pagination for notes in 'details-sujet' * added error-prone cases in paginator * fixed non-working modals, added titles * added UpdateStatistiques capacity in CompteRenduCreate view * fixed missing AjaxTemplateMixin for CreateSujetView, worked on compte-rendu creation scripts * fixed MaraudeManager.all_of() for common Maraudeurs, added color hints in planning * re-instated statistiques module link and first test page * added FinalizeView to send a mail before finalizing compte-rendu * Added PieChart view for FicheStatistique fields * small style updates, added 'age' and 'genre' fields from sujets in statistiques.PieChartView * worked on statistiques, fixed small issues in 'notes' list views * small theme change * removed some dead code * fixed notes.tests, fixed statistiques.info_completed display, added filter in SujetLisView * added some tests * added customised admin templates * added authenticate in CustomAuthenticatationBackend, more verbose login thanks to messages * added django-nose for test coverage * Corrected raising exception on first migration On first migration, qs.exists() would previously be called and raising an Exception, sot he migrations would fail. * Better try block * cleaned up custom settings.py, added some overrides of django base_settings * corrected bad dictionnary key
This commit is contained in:
3
website/static/scripts/bootstrap-modal.js
vendored
3
website/static/scripts/bootstrap-modal.js
vendored
@@ -22,7 +22,8 @@
|
||||
}
|
||||
},
|
||||
error: function (xhr, ajaxOptions, thrownError) {
|
||||
// handle response errors here
|
||||
console.log("Error with ajax request : ");
|
||||
console.log(thrownError);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
8
website/static/scripts/jquery.flot.min.js
vendored
Normal file
8
website/static/scripts/jquery.flot.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@@ -1,8 +1,7 @@
|
||||
$(function() {
|
||||
|
||||
var input = $('#id_heure_debut')
|
||||
var min_value = input.attr('value').split(":")
|
||||
var is_morning = (min_value[0] <= 12)
|
||||
|
||||
$.fn.editHeureValue = function(mod) {
|
||||
var value = input.attr('value').split(":");
|
||||
var new_hour = parseInt(value[0]);
|
||||
@@ -19,23 +18,19 @@
|
||||
} else if (new_hour < 0) {
|
||||
new_hour += 24
|
||||
};
|
||||
|
||||
value[0] = new_hour;
|
||||
value[1] = new_minutes;
|
||||
var test_value = value[0] * 10000 + value[1] * 100 + parseInt(value[2]);
|
||||
var test_min_value = min_value[0] * 10000 + min_value[1] *100 + parseInt(min_value[2]);
|
||||
console.log('test:', test_value, 'min:', test_min_value)
|
||||
if (test_value >= test_min_value || (!is_morning && test_value < 120000)) {
|
||||
input.attr('value', value.join(":"));
|
||||
console.log('updated!')
|
||||
};
|
||||
input.attr('value', value.join(":"));
|
||||
|
||||
};
|
||||
|
||||
$('#minus-5').click(function() {
|
||||
$.fn.editHeureValue(-5)
|
||||
console.log('minus 5')
|
||||
//console.log('minus 5')
|
||||
});
|
||||
$('#plus-5').click(function() {
|
||||
$.fn.editHeureValue(5)
|
||||
console.log('plus 5')
|
||||
//console.log('plus 5')
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user