QRouland/M2OLA
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TG-121 : administration space - add importVisitSheets modal

Browse Source
This commit is contained in:
mpenchenat
2017-03-29 14:30:57 +02:00
parent c7a574c97f
commit 4d9dc85ae8
4 changed files with 145 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/app/scripts/controllers/administrationDialog.js
View File

@ -9,8 +9,9 @@
* Controller of the frontendApp
*/
angular.module('clientApp')
.controller('AdministrationDialogCtrl', function ($scope, $state, FileUploader, $mdDialog, fileNameFilter, illegalFileNamesFilter) {
.controller('AdministrationDialogCtrl', function ($scope, $state, FileUploader, $mdDialog, fileNameFilter, illegalFileNamesFilter, type) {
console.log(type);
// Public methods -------------------
@ -27,11 +28,11 @@
};
$scope.allDocumentsAreIllegal = function() {
return (fileNameFilter(uploader.queue, 'absence').length === 0);
return (fileNameFilter(uploader.queue, type).length === 0);
};
$scope.areThereIllegalFiles = function() {
return (illegalFileNamesFilter(uploader.queue, 'absence').length !== 0);
return (illegalFileNamesFilter(uploader.queue, type).length !== 0);
};
var uploader = $scope.uploader = new FileUploader({

25
frontend/app/scripts/controllers/administrationSpace.js
View File

@ -15,7 +15,8 @@
logout,
deleteAbsence,
deleteTrackingSheet,
importAbsences
importAbsences,
importVisitSheets
})
init();
@ -34,14 +35,32 @@
$scope.formationGroups[groupIndex].trackingSheets.splice(trackingSheetIndex, 1);
}
function importAbsences(ev, type) {
function importVisitSheets(ev) {
$mdDialog.show({
controller: 'AdministrationDialogCtrl',
templateUrl: 'import-fiches-visite',
parent: angular.element(document.body),
targetEvent: ev,
clickOutsideToClose: true,
fullscreen: 'false',
locals : { type : 'visit'}
})
.then(function (answer) {
$scope.status = 'You said the information was "' + answer + '".';
}, function () {
$scope.status = 'You cancelled the dialog.';
});
}
function importAbsences(ev) {
$mdDialog.show({
controller: 'AdministrationDialogCtrl',
templateUrl: 'import-fiches-absences',
parent: angular.element(document.body),
targetEvent: ev,
clickOutsideToClose: true,
fullscreen: 'false'
fullscreen: 'false',
locals : { type : 'absence'}
})
.then(function (answer) {
$scope.status = 'You said the information was "' + answer + '".';

4
frontend/app/scripts/services/Filters.js
View File

@ -7,7 +7,7 @@
return function (queue, type) {
var reg = (type === 'absence') ?/^Absence_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/ : /^Visite_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/;
var reg = (type === 'absence') ?/^Absence_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/ : /^Visite_[A-Z][a-z]*_[A-Z][a-z]*_\d*.pdf$/;
return queue.filter(function (item) {
return reg.test(item.file.name);
});
@ -17,7 +17,7 @@
return function (queue, type) {
var reg = (type === 'absence') ?/^Absence_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/ : /^Visite_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/;
var reg = (type === 'absence') ?/^Absence_[A-Z][a-z]*_[A-Z][a-z]*_P\d*.pdf$/ : /^Visite_[A-Z][a-z]*_[A-Z][a-z]*_\d*.pdf$/;
return queue.filter(function (item) {
return !reg.test(item.file.name);
}).map(function(item) {