diff --git a/frontend/app/scripts/controllers/administrationDialog.js b/frontend/app/scripts/controllers/administrationDialog.js
index 03c9253..c76a7a2 100644
--- a/frontend/app/scripts/controllers/administrationDialog.js
+++ b/frontend/app/scripts/controllers/administrationDialog.js
@@ -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({
diff --git a/frontend/app/scripts/controllers/administrationSpace.js b/frontend/app/scripts/controllers/administrationSpace.js
index 2fbff2b..220feb0 100644
--- a/frontend/app/scripts/controllers/administrationSpace.js
+++ b/frontend/app/scripts/controllers/administrationSpace.js
@@ -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 + '".';
diff --git a/frontend/app/scripts/services/Filters.js b/frontend/app/scripts/services/Filters.js
index 3eb80dc..cc1312f 100644
--- a/frontend/app/scripts/services/Filters.js
+++ b/frontend/app/scripts/services/Filters.js
@@ -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) {
diff --git a/frontend/app/views/administrationSpace.html b/frontend/app/views/administrationSpace.html
index 9485665..a1f1dcb 100644
--- a/frontend/app/views/administrationSpace.html
+++ b/frontend/app/views/administrationSpace.html
@@ -61,7 +61,7 @@
- Les documents suivants ne respecte pas la règle de nommage : + Les documents suivants ne respectent pas la règle de nommage :