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
Show Stats 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 * Controller of the frontendApp
*/ */
angular.module('clientApp') 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 ------------------- // Public methods -------------------
@ -27,11 +28,11 @@
}; };
$scope.allDocumentsAreIllegal = function() { $scope.allDocumentsAreIllegal = function() {
return (fileNameFilter(uploader.queue, 'absence').length === 0); return (fileNameFilter(uploader.queue, type).length === 0);
}; };
$scope.areThereIllegalFiles = function() { $scope.areThereIllegalFiles = function() {
return (illegalFileNamesFilter(uploader.queue, 'absence').length !== 0); return (illegalFileNamesFilter(uploader.queue, type).length !== 0);
}; };
var uploader = $scope.uploader = new FileUploader({ var uploader = $scope.uploader = new FileUploader({

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

@ -15,7 +15,8 @@
logout, logout,
deleteAbsence, deleteAbsence,
deleteTrackingSheet, deleteTrackingSheet,
importAbsences importAbsences,
importVisitSheets
}) })
init(); init();
@ -34,14 +35,32 @@
$scope.formationGroups[groupIndex].trackingSheets.splice(trackingSheetIndex, 1); $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({ $mdDialog.show({
controller: 'AdministrationDialogCtrl', controller: 'AdministrationDialogCtrl',
templateUrl: 'import-fiches-absences', templateUrl: 'import-fiches-absences',
parent: angular.element(document.body), parent: angular.element(document.body),
targetEvent: ev, targetEvent: ev,
clickOutsideToClose: true, clickOutsideToClose: true,
fullscreen: 'false' fullscreen: 'false',
locals : { type : 'absence'}
}) })
.then(function (answer) { .then(function (answer) {
$scope.status = 'You said the information was "' + 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) { 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 queue.filter(function (item) {
return reg.test(item.file.name); return reg.test(item.file.name);
}); });
@ -17,7 +17,7 @@
return function (queue, type) { 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 queue.filter(function (item) {
return !reg.test(item.file.name); return !reg.test(item.file.name);
}).map(function(item) { }).map(function(item) {

119
frontend/app/views/administrationSpace.html
View File

@ -61,7 +61,7 @@
</div> </div>
<br /> <br />
<center> <center>
<md-button class="md-raised md-primary">Importer des fiches de visite</md-button> <md-button class="md-raised md-primary" ng-click="importVisitSheets($event)">Importer des fiches de visite</md-button>
</center> </center>
</md-content> </md-content>
</md-card-content> </md-card-content>
@ -106,7 +106,7 @@
<div ng-if="areThereIllegalFiles()" style="background-color: #ef9a9a; padding: 2px 10px 2px 10px;margin: 10px 0 10px 0"> <div ng-if="areThereIllegalFiles()" style="background-color: #ef9a9a; padding: 2px 10px 2px 10px;margin: 10px 0 10px 0">
<p> <p>
Les documents suivants ne respecte pas la règle de nommage : Les documents suivants ne respectent pas la règle de nommage :
</p> </p>
<ul> <ul>
<li ng-repeat="fileName in uploader.queue | illegalFileNames:'absence'">{{fileName}}</li> <li ng-repeat="fileName in uploader.queue | illegalFileNames:'absence'">{{fileName}}</li>
@ -187,3 +187,118 @@
</form> </form>
</md-dialog> </md-dialog>
</script> </script>
<script type="text/ng-template" id="import-fiches-visite">
<md-dialog aria-label="Importer des fiches de visite">
<form ng-cloak>
<md-toolbar>
<div class="md-toolbar-tools">
<h2>Importer des fiches de visite</h2>
</div>
</md-toolbar>
<md-dialog-content>
<div class="md-dialog-content">
<div layout="row">
<div flex>
<h3>Importer des fiches de visite</h3>
<input type="file" nv-file-select="" accept=".pdf" uploader="uploader" multiple /><br/><br/>
<p class="note">
<ng-md-icon icon="warning" size="20"></ng-md-icon>
Note d'utilisation : chaque fiche de visite doit respecter une règle de nommage.<br/> Nom
de fichier : Visite_Prenom_Nom_N.pdf<br/>
<i>Le N étant un numéro.</i>
</p>
<div ng-if="uploader.queue.length !== 0">
<h3>Liste des documents : </h3>
<p>Nombre de documents : {{ uploader.queue.length }}</p>
<div ng-if="areThereIllegalFiles()" style="background-color: #ef9a9a; padding: 2px 10px 2px 10px;margin: 10px 0 10px 0">
<p>
Les documents suivants ne respectent pas la règle de nommage :
</p>
<ul>
<li ng-repeat="fileName in uploader.queue | illegalFileNames:'visit'">{{fileName}}</li>
</ul>
</div>
<div ng-if="!allDocumentsAreIllegal()">
<table class="bordered">
<thead>
<tr>
<th width="50%">Nom</th>
<th ng-show="uploader.isHTML5">Taille</th>
<th>Status</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in uploader.queue | fileName:'visit'">
<td><strong>{{ item.file.name }}</strong></td>
<td ng-show="uploader.isHTML5" nowrap>{{ item.file.size/1024/1024|number:2 }} MB</td>
<td class="text-center">
<span ng-show="item.isSuccess">
<ng-md-icon icon="done" size="24"></ng-md-icon>
</span>
<span ng-show="item.isCancel">
<ng-md-icon icon="cancel" size="24"></ng-md-icon>
</span>
<span ng-show="item.isError">
<ng-md-icon icon="remove_circle_outline" size="24"></ng-md-icon>
</span>
</td>
<td nowrap>
<md-button type="button" class="md-raised md-primary" ng-click="item.upload()" ng-disabled="item.isReady || item.isUploading || item.isSuccess">
<ng-md-icon icon="file_upload" size="24"></ng-md-icon> Charger
</md-button>
<md-button type="button" class="md-raised" ng-click="item.cancel()" ng-disabled="!item.isUploading">
<ng-md-icon icon="cancel" size="24"></ng-md-icon> Annuler
</md-button>
<md-button type="button" class="md-raised md-warn" ng-click="item.remove()">
<ng-md-icon icon="remove_circle_outline" size="24"></ng-md-icon> Supprimer
</md-button>
</td>
</tr>
</tbody>
</table>
<div style='margin-top : 40px'>
<div>
Niveau de progression :
<md-progress-linear md-mode="determinate" value="{{uploader.progress}}"></md-progress-linear>
</div>
<md-button type="button" class="md-raised md-primary" ng-click="uploader.uploadAll()" ng-disabled="!uploader.getNotUploadedItems().length">
<ng-md-icon icon="file_upload" size="24"></ng-md-icon> Tout charger
</md-button>
<md-button type="button" class="md-raised" ng-click="uploader.cancelAll()" ng-disabled="!uploader.isUploading">
<ng-md-icon icon="cancel" size="24"></ng-md-icon> Tout annuler
</md-button>
<md-button type="button" class="md-raised md-warn" ng-click="uploader.clearQueue()" ng-disabled="!uploader.queue.length">
<ng-md-icon icon="remove_circle_outline" size="24"></ng-md-icon> Tout supprimer
</md-button>
</div>
</div>
</div>
</div>
</div>
</div>
</md-dialog-content>
<md-dialog-actions layout="row">
<span flex></span>
<md-button ng-click="answer('useful')">
Fermer
</md-button>
</md-dialog-actions>
</form>
</md-dialog>
</script>