Download as
Browse Code »

Commit acd27c045f279d63c6ff9d3947c125e80eee56b4

Authored by Ronan Tavares Camargo
1 parent 22689dff
Exists in master

Redmine #4426

Showing 10 changed files with 66 additions and 114 deletions   Show diff stats
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_aditivo.html
  Diff comments   View file @acd27c0
... ... @@ -166,17 +166,13 @@
166 166 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
167 167 <div class="row">
168 168 <div class="col-sm-12">
169   - <div style="overflow-y:scroll;height: 296px; overflow-x: hidden;">
170   - <componente-associar-documentos ng-documentos="aditivo.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogAditivo"
171   - ng-obrigatorio="false"></componente-associar-documentos>
172   - </div>
  169 + <componente-associar-documentos ng-documentos="aditivo.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogAditivo"
  170 + ng-obrigatorio="false"></componente-associar-documentos>
173 171 </div>
174 172 </div>
175 173 <div class="row">
176 174 <div class="col-sm-12">
177   - <div style="overflow-y:scroll;height: 292px; overflow-x: hidden;">
178   - <componente-observacao ng-observacoes="aditivo.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
179   - </div>
  175 + <componente-observacao ng-observacoes="aditivo.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
180 176 </div>
181 177 </div>
182 178 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_aplicar_penalidade.html
  Diff comments   View file @acd27c0
... ... @@ -145,22 +145,16 @@
145 145 </tab>
146 146 <tab>
147 147 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
148   - <div class="scrollbar-inner">
149   - <div class="row">
150   - <div class="col-sm-12">
151   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
152   - <componente-associar-documentos ng-documentos="eventoPenalidade.documentos" ng-edit="edit" ng-uploader="uploader"
153   - ng-workspace="$parent.workspace" form="cnt_ev_penalidadeForm">
154   - </componente-associar-documentos>
155   - </div>
156   - </div>
  148 + <div class="row">
  149 + <div class="col-sm-12">
  150 + <componente-associar-documentos ng-documentos="eventoPenalidade.documentos" ng-edit="edit" ng-uploader="uploader"
  151 + ng-workspace="$parent.workspace" form="cnt_ev_penalidadeForm">
  152 + </componente-associar-documentos>
157 153 </div>
158   - <div class="row">
159   - <div class="col-sm-12">
160   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
161   - <componente-observacao ng-observacoes="eventoPenalidade.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_penalidadeForm"></componente-observacao>
162   - </div>
163   - </div>
  154 + </div>
  155 + <div class="row">
  156 + <div class="col-sm-12">
  157 + <componente-observacao ng-observacoes="eventoPenalidade.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_penalidadeForm"></componente-observacao>
164 158 </div>
165 159 </div>
166 160 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html
  Diff comments   View file @acd27c0
... ... @@ -82,22 +82,16 @@
82 82 </tab>
83 83 <tab>
84 84 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
85   - <div class="scrollbar-inner">
86   - <div class="row">
87   - <div class="col-sm-12">
88   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
89   - <componente-associar-documentos ng-documentos="eventoApostilamento.documentos" ng-edit="edit" ng-uploader="uploader"
90   - ng-workspace="$parent.workspace" form="cnt_ev_apostilamentoForm">
91   - </componente-associar-documentos>
92   - </div>
93   - </div>
  85 + <div class="row">
  86 + <div class="col-sm-12">
  87 + <componente-associar-documentos ng-documentos="eventoApostilamento.documentos" ng-edit="edit" ng-uploader="uploader"
  88 + ng-workspace="$parent.workspace" form="cnt_ev_apostilamentoForm">
  89 + </componente-associar-documentos>
94 90 </div>
95   - <div class="row">
96   - <div class="col-sm-12">
97   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
98   - <componente-observacao ng-observacoes="eventoApostilamento.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_apostilamentoForm"></componente-observacao>
99   - </div>
100   - </div>
  91 + </div>
  92 + <div class="row">
  93 + <div class="col-sm-12">
  94 + <componente-observacao ng-observacoes="eventoApostilamento.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_apostilamentoForm"></componente-observacao>
101 95 </div>
102 96 </div>
103 97 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_atualizacao_status.html
  Diff comments   View file @acd27c0
... ... @@ -146,21 +146,17 @@
146 146 <translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
147 147 <div class="row">
148 148 <div class="col-sm-12">
149   - <div style="overflow-y: scroll; height: 296px; overflow-x: hidden;">
150   - <componente-associar-documentos
151   - ng-documentos="atualizacaoStatus.documentos" ng-edit="edit"
152   - ng-uploader="uploader" ng-workspace="$parent.workspace"
153   - form="formDialogAtualizaoStatus" ng-obrigatorio="false"></componente-associar-documentos>
154   - </div>
  149 + <componente-associar-documentos
  150 + ng-documentos="atualizacaoStatus.documentos" ng-edit="edit"
  151 + ng-uploader="uploader" ng-workspace="$parent.workspace"
  152 + form="formDialogAtualizaoStatus" ng-obrigatorio="false"></componente-associar-documentos>
155 153 </div>
156 154 </div>
157 155 <div class="row">
158 156 <div class="col-sm-12">
159   - <div style="overflow-y: scroll; height: 292px; overflow-x: hidden;">
160   - <componente-observacao
161   - ng-observacoes="atualizacaoStatus.observacoes" ng-hide="false"
162   - ng-edit="edit"></componente-observacao>
163   - </div>
  157 + <componente-observacao
  158 + ng-observacoes="atualizacaoStatus.observacoes" ng-hide="false"
  159 + ng-edit="edit"></componente-observacao>
164 160 </div>
165 161 </div>
166 162 </tab> </tabset>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_empenho.html
  Diff comments   View file @acd27c0
... ... @@ -112,22 +112,16 @@
112 112 </tab>
113 113 <tab>
114 114 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
115   - <div class="scrollbar-inner">
116   - <div class="row">
117   - <div class="col-sm-12">
118   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
119   - <componente-associar-documentos ng-documentos="contratoEmpenho.documentos" ng-edit="edit" ng-uploader="uploader"
120   - ng-workspace="$parent.workspace" form="cnt_ev_registrar_empenhoForm">
121   - </componente-associar-documentos>
122   - </div>
123   - </div>
  115 + <div class="row">
  116 + <div class="col-sm-12">
  117 + <componente-associar-documentos ng-documentos="contratoEmpenho.documentos" ng-edit="edit" ng-uploader="uploader"
  118 + ng-workspace="$parent.workspace" form="cnt_ev_registrar_empenhoForm">
  119 + </componente-associar-documentos>
124 120 </div>
125   - <div class="row">
126   - <div class="col-sm-12">
127   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
128   - <componente-observacao ng-observacoes="contratoEmpenho.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_registrar_empenhoForm"></componente-observacao>
129   - </div>
130   - </div>
  121 + </div>
  122 + <div class="row">
  123 + <div class="col-sm-12">
  124 + <componente-observacao ng-observacoes="contratoEmpenho.observacoes" ng-hide="false" ng-edit="edit" form="cnt_ev_registrar_empenhoForm"></componente-observacao>
131 125 </div>
132 126 </div>
133 127 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_liberacao_pagamento.html
  Diff comments   View file @acd27c0
... ... @@ -260,16 +260,12 @@
260 260 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
261 261 <div class="row">
262 262 <div class="col-sm-12">
263   - <div style="overflow-y:scroll;height: 296px; overflow-x: hidden;">
264   - <componente-associar-documentos ng-documentos="liberacaoPagamento.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogLiberacaoPagamento" ng-obrigatorio="false"></componente-associar-documentos>
265   - </div>
  263 + <componente-associar-documentos ng-documentos="liberacaoPagamento.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogLiberacaoPagamento" ng-obrigatorio="false"></componente-associar-documentos>
266 264 </div>
267 265 </div>
268 266 <div class="row">
269 267 <div class="col-sm-12">
270   - <div style="overflow-y:scroll;height: 292px; overflow-x: hidden;">
271   - <componente-observacao ng-observacoes="liberacaoPagamento.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
272   - </div>
  268 + <componente-observacao ng-observacoes="liberacaoPagamento.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
273 269 </div>
274 270 </div>
275 271 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_recebimentoobjeto.html
  Diff comments   View file @acd27c0
... ... @@ -179,23 +179,17 @@
179 179 </tab>
180 180 <tab>
181 181 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
182   - <div class="scrollbar-inner">
183   - <div class="row">
184   - <div class="col-sm-12">
185   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
186   - <componente-associar-documentos ng-documentos="recebimentoObjeto.documentos" ng-edit="edit" ng-uploader="uploader"
187   - ng-workspace="$parent.workspace" form="formDialogRecebimentoObjeto">
188   - </componente-associar-documentos>
189   - </div>
190   - </div>
  182 + <div class="row">
  183 + <div class="col-sm-12">
  184 + <componente-associar-documentos ng-documentos="recebimentoObjeto.documentos" ng-edit="edit" ng-uploader="uploader"
  185 + ng-workspace="$parent.workspace" form="formDialogRecebimentoObjeto">
  186 + </componente-associar-documentos>
191 187 </div>
192   - <div class="row">
193   - <div class="col-sm-12">
194   - <div style="overflow-y:scroll; height: 300px; overflow-x: hidden;">
195   - <componente-observacao ng-observacoes="recebimentoObjeto.observacoes" ng-hide="false" ng-edit="edit" form="formDialogRecebimentoObjeto">
196   - </componente-observacao>
197   - </div>
198   - </div>
  188 + </div>
  189 + <div class="row">
  190 + <div class="col-sm-12">
  191 + <componente-observacao ng-observacoes="recebimentoObjeto.observacoes" ng-hide="false" ng-edit="edit" form="formDialogRecebimentoObjeto">
  192 + </componente-observacao>
199 193 </div>
200 194 </div>
201 195 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_registro_nc.html
  Diff comments   View file @acd27c0
... ... @@ -107,21 +107,17 @@
107 107 <translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
108 108 <div class="row">
109 109 <div class="col-sm-12">
110   - <div style="overflow-y: scroll; height: 296px; overflow-x: hidden;">
111   - <componente-associar-documentos
112   - ng-documentos="registroNaoConformidade.documentos" ng-edit="edit"
113   - ng-uploader="uploader" ng-workspace="$parent.workspace"
114   - form="formDialogNaoConformidade" ng-obrigatorio="false"></componente-associar-documentos>
115   - </div>
  110 + <componente-associar-documentos
  111 + ng-documentos="registroNaoConformidade.documentos" ng-edit="edit"
  112 + ng-uploader="uploader" ng-workspace="$parent.workspace"
  113 + form="formDialogNaoConformidade" ng-obrigatorio="false"></componente-associar-documentos>
116 114 </div>
117 115 </div>
118 116 <div class="row">
119 117 <div class="col-sm-12">
120   - <div style="overflow-y: scroll; height: 292px; overflow-x: hidden;">
121   - <componente-observacao
122   - ng-observacoes="registroNaoConformidade.observacoes" ng-hide="false"
123   - ng-edit="edit"></componente-observacao>
124   - </div>
  118 + <componente-observacao
  119 + ng-observacoes="registroNaoConformidade.observacoes" ng-hide="false"
  120 + ng-edit="edit"></componente-observacao>
125 121 </div>
126 122 </div>
127 123 </tab> </tabset>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_repactuacao.html
  Diff comments   View file @acd27c0
... ... @@ -107,17 +107,13 @@
107 107 <tab-heading><translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
108 108 <div class="row">
109 109 <div class="col-sm-12">
110   - <div style="overflow-y:scroll;height: 296px; overflow-x: hidden;">
111   - <componente-associar-documentos ng-documentos="repactuacao.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogRepactuacao"
112   - ng-obrigatorio="false"></componente-associar-documentos>
113   - </div>
  110 + <componente-associar-documentos ng-documentos="repactuacao.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="formDialogRepactuacao"
  111 + ng-obrigatorio="false"></componente-associar-documentos>
114 112 </div>
115 113 </div>
116 114 <div class="row">
117 115 <div class="col-sm-12">
118   - <div style="overflow-y:scroll;height: 292px; overflow-x: hidden;">
119   - <componente-observacao ng-observacoes="repactuacao.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
120   - </div>
  116 + <componente-observacao ng-observacoes="repactuacao.observacoes" ng-hide="false" ng-edit="edit"></componente-observacao>
121 117 </div>
122 118 </div>
123 119 </tab>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_rescisao_contrato.html
  Diff comments   View file @acd27c0
... ... @@ -178,21 +178,17 @@
178 178 <translate>LABEL.ANEXOS_OBSERVACOES</translate></tab-heading>
179 179 <div class="row">
180 180 <div class="col-sm-12">
181   - <div style="overflow-y: scroll; height: 296px; overflow-x: hidden;">
182   - <componente-associar-documentos
183   - ng-documentos="rescisaoContrato.documentos" ng-edit="edit"
184   - ng-uploader="uploader" ng-workspace="$parent.workspace"
185   - form="formDialogRescisaoContrato" ng-obrigatorio="false"></componente-associar-documentos>
186   - </div>
  181 + <componente-associar-documentos
  182 + ng-documentos="rescisaoContrato.documentos" ng-edit="edit"
  183 + ng-uploader="uploader" ng-workspace="$parent.workspace"
  184 + form="formDialogRescisaoContrato" ng-obrigatorio="false"></componente-associar-documentos>
187 185 </div>
188 186 </div>
189 187 <div class="row">
190 188 <div class="col-sm-12">
191   - <div style="overflow-y: scroll; height: 292px; overflow-x: hidden;">
192   - <componente-observacao
193   - ng-observacoes="rescisaoContrato.observacoes" ng-hide="false"
194   - ng-edit="edit"></componente-observacao>
195   - </div>
  189 + <componente-observacao
  190 + ng-observacoes="rescisaoContrato.observacoes" ng-hide="false"
  191 + ng-edit="edit"></componente-observacao>
196 192 </div>
197 193 </div>
198 194 </tab> </tabset>
... ...