Download as
Browse Code »

Commit 3f6f7b12d99fac5f4f7bfd72bb232b6596753e98

Authored by thiago.coimbra
1 parent 90087389
Exists in master

redmine #4841 Adicionada a seguinte mascara 'nomeColaborador + ' - SIAPE: ' + matriculaColaborador'.

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/html/inventario/inventarioEdit.html
  Diff comments   View file @3f6f7b1
@@ -596,7 +596,7 @@ @@ -596,7 +596,7 @@
596 <td colspan="4"> 596 <td colspan="4">
597 <div class="row" > 597 <div class="row" >
598 <div class="col-sm-6"> 598 <div class="col-sm-6">
599 - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 599 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
600 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" > 600 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" >
601 </auto-complete> 601 </auto-complete>
602 </div> 602 </div>
@@ -829,7 +829,7 @@ @@ -829,7 +829,7 @@
829 <td colspan="4"> 829 <td colspan="4">
830 <div class="row" > 830 <div class="row" >
831 <div class="col-sm-6"> 831 <div class="col-sm-6">
832 - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 832 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
833 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 833 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
834 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" > 834 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
835 </auto-complete> 835 </auto-complete>
@@ -1015,7 +1015,7 @@ @@ -1015,7 +1015,7 @@
1015 <td colspan="4"> 1015 <td colspan="4">
1016 <div class="row" > 1016 <div class="row" >
1017 <div class="col-sm-5"> 1017 <div class="col-sm-5">
1018 - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 1018 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1019 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" 1019 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1020 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" > 1020 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
1021 </auto-complete> 1021 </auto-complete>
@@ -1926,7 +1926,7 @@ @@ -1926,7 +1926,7 @@
1926 <label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data> 1926 <label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data>
1927 </div> 1927 </div>
1928 <div class="col-sm-12"> 1928 <div class="col-sm-12">
1929 - <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria" 1929 + <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria"
1930 form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true"> 1930 form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true">
1931 </auto-complete> 1931 </auto-complete>
1932 </div> 1932 </div>
citgrp-patrimonio-web/src/main/webapp/html/saidaTemporaria/saidaTemporariaEdit.html
  Diff comments   View file @3f6f7b1
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </legend> 53 </legend>
54 <div class="row"> 54 <div class="row">
55 <div class="col-sm-9"> 55 <div class="col-sm-9">
56 - <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete> 56 + <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete>
57 </div><!-- .col-sm-9 --> 57 </div><!-- .col-sm-9 -->
58 <div class="col-sm-3"> 58 <div class="col-sm-3">
59 <label-input-data ng-id="dataSaida" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="!edit" ng-model="saidaTemporaria.dataSaida"></label-input-data> 59 <label-input-data ng-id="dataSaida" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="!edit" ng-model="saidaTemporaria.dataSaida"></label-input-data>
citgrp-patrimonio-web/src/main/webapp/html/saidaTemporariaItem/saidaTemporariaItemEdit.html
  Diff comments   View file @3f6f7b1
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <legend><translate>PATRIMONIO.LABEL.DADOS_RETORNO</translate></legend> 59 <legend><translate>PATRIMONIO.LABEL.DADOS_RETORNO</translate></legend>
60 <div class="row"> 60 <div class="row">
61 <div class="col-sm-9"> 61 <div class="col-sm-9">
62 - <auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete> 62 + <auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete>
63 </div><!-- .col-sm-9 --> 63 </div><!-- .col-sm-9 -->
64 <div class="col-sm-3"> 64 <div class="col-sm-3">
65 <label-input-data ng-id="saidaTemporariaItem.dataRetornoAlterada" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_DE_RETORNO" ng-obrigatorio="true" ng-disabled="!editItem" ng-model="saidaTemporariaItem.dataRetornoAlterada"></label-input-data> 65 <label-input-data ng-id="saidaTemporariaItem.dataRetornoAlterada" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_DE_RETORNO" ng-obrigatorio="true" ng-disabled="!editItem" ng-model="saidaTemporariaItem.dataRetornoAlterada"></label-input-data>