Download as
Browse Code »

Commit bce10dddb54e4a328f5ed714bddf31b89200a3a5

Authored by Ronan Tavares Camargo
1 parent 0fb7bd66
Exists in master

Redmine #4426

Showing 2 changed files with 50 additions and 28 deletions   Show diff stats
cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js
  Diff comments   View file @bce10dd
... ... @@ -68,16 +68,23 @@ citApp.directive("componenteAssociarDocumentos", ["$translate",
68 68 scope: this
69 69 });
70 70 };
71   -
72   - $scope.inicializarModalDocumentos = function(){
73   - $scope.editDocumento = true;
  71 +
  72 + function resetModalDocumentos(){
74 73 $scope.documento = {
75 74 anexos : [],
76 75 $uuid : getUuid()
77 76 };
  77 +
78 78 if($scope.uploader.queue && $scope.uploader.queue.length > 0){
79 79 $scope.uploader.queue.splice($scope.uploader.queue[0], 1);
80 80 }
  81 + }
  82 +
  83 + $scope.inicializarModalDocumentos = function(){
  84 + $scope.editDocumento = true;
  85 +
  86 + resetModalDocumentos();
  87 +
81 88 $scope.openModal('modal-documentos.html', 'md');
82 89 };
83 90  
... ... @@ -86,34 +93,44 @@ citApp.directive("componenteAssociarDocumentos", ["$translate",
86 93 console.info('onCompleteAll');
87 94 };
88 95  
89   - $scope.salvarAdicionarDocumento = function(formDialogDocumentos){
  96 + $scope.salvarAdicionarDocumento = function(formDialogDocumentos, continuarEditando){
90 97 var hoje = new Date();
91 98 formDialogDocumentos.$submitted = true;
92   - if(formDialogDocumentos.$valid && !(converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje)){
93   - $scope.documento.uploadsDocumento = $scope.uploader.getNotUploadedItems();
94   -
95   - if ($scope.documentos == undefined || $scope.documentos == null) {
96   - $scope.documentos = [];
97   - }
98   - $scope.dominiosTipoDocumento.forEach(function (tipoDocumento, key) {
99   - if($scope.documento.dominioTipoDocumento.id === tipoDocumento.id){
100   - $scope.documento.dominioTipoDocumento = tipoDocumento.originalElement;
101   - }
102   - });
103   - $scope.documentos.forEach(function (documento, key) {
104   - if(documento.$uuid && $scope.documento.$uuid && documento.$uuid === $scope.documento.$uuid || documento.id && $scope.documento.id && documento.id === $scope.documento.id ){
105   - $scope.documentos.splice(key, 1);
106   - }
107   - });
108   - $scope.documentos.push($scope.documento);
109   - $scope.$modalInstance.dismiss('cancel');
110   - } else if(formDialogDocumentos.$valid && (converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje)){
111   -
112   - $scope.$parent.showAlert('error', $translate.instant('VALIDACAO.DATA_EMISSAO_DATA_ATUAL'));
113   - }else if(formDialogDocumentos.$invalid){
114   -
  99 +
  100 + if(formDialogDocumentos.$invalid){
115 101 $scope.$parent.showAlert('error', $translate.instant('VALIDACAO.ALERTA_OBRIGATORIOS'));
  102 + return;
116 103 }
  104 +
  105 + if(converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje){
  106 + $scope.$parent.showAlert('error', $translate.instant('VALIDACAO.DATA_EMISSAO_DATA_ATUAL'));
  107 + return;
  108 + }
  109 +
  110 + $scope.documento.uploadsDocumento = $scope.uploader.getNotUploadedItems();
  111 +
  112 + if ($scope.documentos == undefined || $scope.documentos == null) {
  113 + $scope.documentos = [];
  114 + }
  115 + $scope.dominiosTipoDocumento.forEach(function (tipoDocumento, key) {
  116 + if($scope.documento.dominioTipoDocumento.id === tipoDocumento.id){
  117 + $scope.documento.dominioTipoDocumento = tipoDocumento.originalElement;
  118 + }
  119 + });
  120 + $scope.documentos.forEach(function (documento, key) {
  121 + if(documento.$uuid && $scope.documento.$uuid && documento.$uuid === $scope.documento.$uuid || documento.id && $scope.documento.id && documento.id === $scope.documento.id ){
  122 + $scope.documentos.splice(key, 1);
  123 + }
  124 + });
  125 + $scope.documentos.push($scope.documento);
  126 +
  127 + if(continuarEditando){
  128 + formDialogDocumentos.$submitted = false;
  129 + formDialogDocumentos.$setPristine();
  130 + resetModalDocumentos();
  131 + }else{
  132 + $scope.$modalInstance.dismiss('cancel');
  133 + }
117 134 };
118 135  
119 136 $scope.removerDocumento = function(){
... ...
cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html
  Diff comments   View file @bce10dd
1 1 <form name="formDialogDocumentos" novalidade>
2 2 <div class="modal-header">
3   - <button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos)">
  3 + <button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos, false)">
4 4 <i class="fa fa-save green"></i>
5 5 <translate>LABEL.SALVAR</translate>
6 6 </button>
  7 +
  8 + <button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos, true)">
  9 + <i class="fa fa-save green"></i>
  10 + <translate>LABEL.ADICIONAR_CONTINUAR</translate>
  11 + </button>
7 12  
8 13 <button ng-click="$dismiss('cancel');" type="button" class="btn btn-clear">
9 14 <i class="fa fa-times red"></i>
... ...