Loading front/PieceJointe/ListePiecesJointes.vue +3 −1 Original line number Diff line number Diff line Loading @@ -3,7 +3,8 @@ <h1>Liste pieces jointes</h1> <pieceJointe v-for="(pieceJointe, key) in datasPiecesJointes" :datas="pieceJointe" :intervenant="intervenant"></pieceJointe> :intervenant="intervenant" @refresh="getPiecesJointes"></pieceJointe> </div> </template> Loading @@ -25,6 +26,7 @@ export default { return { datasPiecesJointes: null, urlGetPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/get-pieces-jointes', {intervenant: this.intervenant}), } }, Loading front/PieceJointe/PieceJointe.vue +83 −17 Original line number Diff line number Diff line <template> <div class="tpj tpj-obligatoire tpj-1 card bg-default upload-container"> <div class="tpj tpj-obligatoire tpj-1 card bg-success upload-container"> <div class="card-header card-header-h3 "> <h5> <div class="validation-bar float-end" data-url=""> <div v-if="this.datas.pieceJointe"> <!-- actions de validation de la pièce jointe entière --> <a class="valider-pj btn btn-success" href="" :title="'Valider la pièce justificative \'' + datas.typePieceJointe.libelle + '\''"> <i class="fas fa-thumbs-up"></i> Valider </a> <!-- data-loading-text="Patientez..."--> <a class="refuser-pj btn btn-danger ajax-modal" href="" title="Refuser la pièce justificative '{{ datas.typePieceJointe.libelle}}'" > <i class="fas fa-trash-can"></i> Refuser </a> <button v-if="!this.datas.pieceJointe.validation" :id="'valider-' + this.datas.pieceJointe.id" class="btn btn-success" type="button" :title="'Valider la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event)" :data-url="this.urlValiderPiecesJointes"> <u-icon id="action" name="thumbs-up" style="color:black;"/> Valider <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> <button v-if="!this.datas.pieceJointe.validation" :id="'refuser-' + this.datas.pieceJointe.id" class="btn btn-danger" type="button" :title="'Refuser la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event, true)" title="Refuser la pièce jointe" :data-url="this.urlRefuserPiecesJointes"> <u-icon id="action" name="trash" style="color:black;"/> Refuser <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> <button v-if="this.datas.pieceJointe.validation" :id="'devalider-' + this.datas.pieceJointe.id" class="btn btn-danger" type="button" :title="'Dévalider la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event)" :data-url="this.urlDevaliderPiecesJointes"> <u-icon id="action" name="thumbs-up" style="color:black;"/> Dévalider <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> </div> </div> {{ datas.typePieceJointe.libelle }} <br> Loading Loading @@ -69,9 +95,49 @@ export default { }, data() { return {}; return { urlValiderPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/valider/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), urlDevaliderPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/devalider/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), urlRefuserPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/refuser/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), }; }, methods: { refuserPieceJointe(event) { }, methods: {} actionPieceJointe(event, ajax = false) { if (ajax) { modAjax(event.currentTarget, (widget) => { this.$emit('refresh'); }); } else { var url = event.currentTarget.dataset.url; unicaenVue.axios.get(url).then(response => { this.$emit('refresh'); }).catch(error => { this.$emit('refresh'); }) } } } } </script> Loading module/PieceJointe/src/Controller/PieceJointeController.php +1 −5 Original line number Diff line number Diff line Loading @@ -239,11 +239,7 @@ class PieceJointeController extends \Application\Controller\AbstractController $this->getServicePieceJointe()->valider($pj); $this->updateTableauxBord($pj->getIntervenant(), true); $viewModel = new ViewModel(); $viewModel->setTemplate('piece-jointe/piece-jointe/validation'); $viewModel->setVariable('pj', $pj); return $viewModel; return true; } Loading module/PieceJointe/src/Service/TblPieceJointeService.php +6 −6 Original line number Diff line number Diff line Loading @@ -78,7 +78,7 @@ class TblPieceJointeService extends AbstractEntityService 'validee', ['typePieceJointe', ['libelle']], ['pieceJointe', [ ['id', ['validation', ['id', 'histoCreation']], ['fichier', ['nom', Loading Loading
front/PieceJointe/ListePiecesJointes.vue +3 −1 Original line number Diff line number Diff line Loading @@ -3,7 +3,8 @@ <h1>Liste pieces jointes</h1> <pieceJointe v-for="(pieceJointe, key) in datasPiecesJointes" :datas="pieceJointe" :intervenant="intervenant"></pieceJointe> :intervenant="intervenant" @refresh="getPiecesJointes"></pieceJointe> </div> </template> Loading @@ -25,6 +26,7 @@ export default { return { datasPiecesJointes: null, urlGetPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/get-pieces-jointes', {intervenant: this.intervenant}), } }, Loading
front/PieceJointe/PieceJointe.vue +83 −17 Original line number Diff line number Diff line <template> <div class="tpj tpj-obligatoire tpj-1 card bg-default upload-container"> <div class="tpj tpj-obligatoire tpj-1 card bg-success upload-container"> <div class="card-header card-header-h3 "> <h5> <div class="validation-bar float-end" data-url=""> <div v-if="this.datas.pieceJointe"> <!-- actions de validation de la pièce jointe entière --> <a class="valider-pj btn btn-success" href="" :title="'Valider la pièce justificative \'' + datas.typePieceJointe.libelle + '\''"> <i class="fas fa-thumbs-up"></i> Valider </a> <!-- data-loading-text="Patientez..."--> <a class="refuser-pj btn btn-danger ajax-modal" href="" title="Refuser la pièce justificative '{{ datas.typePieceJointe.libelle}}'" > <i class="fas fa-trash-can"></i> Refuser </a> <button v-if="!this.datas.pieceJointe.validation" :id="'valider-' + this.datas.pieceJointe.id" class="btn btn-success" type="button" :title="'Valider la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event)" :data-url="this.urlValiderPiecesJointes"> <u-icon id="action" name="thumbs-up" style="color:black;"/> Valider <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> <button v-if="!this.datas.pieceJointe.validation" :id="'refuser-' + this.datas.pieceJointe.id" class="btn btn-danger" type="button" :title="'Refuser la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event, true)" title="Refuser la pièce jointe" :data-url="this.urlRefuserPiecesJointes"> <u-icon id="action" name="trash" style="color:black;"/> Refuser <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> <button v-if="this.datas.pieceJointe.validation" :id="'devalider-' + this.datas.pieceJointe.id" class="btn btn-danger" type="button" :title="'Dévalider la pièce justificative \'' + this.datas.typePieceJointe.libelle + '\''" @click="actionPieceJointe($event)" :data-url="this.urlDevaliderPiecesJointes"> <u-icon id="action" name="thumbs-up" style="color:black;"/> Dévalider <!-- <u-icon id="waiting" name="spin" rotate="right" style="color:white;display:none;"/>--> </button> </div> </div> {{ datas.typePieceJointe.libelle }} <br> Loading Loading @@ -69,9 +95,49 @@ export default { }, data() { return {}; return { urlValiderPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/valider/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), urlDevaliderPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/devalider/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), urlRefuserPiecesJointes: unicaenVue.url('piece-jointe/intervenant/:intervenant/refuser/:pieceJointe', { intervenant: this.intervenant, pieceJointe: this.datas.pieceJointe ? this.datas.pieceJointe.id : 0 }), }; }, methods: { refuserPieceJointe(event) { }, methods: {} actionPieceJointe(event, ajax = false) { if (ajax) { modAjax(event.currentTarget, (widget) => { this.$emit('refresh'); }); } else { var url = event.currentTarget.dataset.url; unicaenVue.axios.get(url).then(response => { this.$emit('refresh'); }).catch(error => { this.$emit('refresh'); }) } } } } </script> Loading
module/PieceJointe/src/Controller/PieceJointeController.php +1 −5 Original line number Diff line number Diff line Loading @@ -239,11 +239,7 @@ class PieceJointeController extends \Application\Controller\AbstractController $this->getServicePieceJointe()->valider($pj); $this->updateTableauxBord($pj->getIntervenant(), true); $viewModel = new ViewModel(); $viewModel->setTemplate('piece-jointe/piece-jointe/validation'); $viewModel->setVariable('pj', $pj); return $viewModel; return true; } Loading
module/PieceJointe/src/Service/TblPieceJointeService.php +6 −6 Original line number Diff line number Diff line Loading @@ -78,7 +78,7 @@ class TblPieceJointeService extends AbstractEntityService 'validee', ['typePieceJointe', ['libelle']], ['pieceJointe', [ ['id', ['validation', ['id', 'histoCreation']], ['fichier', ['nom', Loading