redmine #4463 sub tabela para tarefas

ROGERIO CASSIMIRO DE SOUZA
1 parent 38f86c52
Showing 5 changed files with 97 additions and 17 deletions Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java
cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html
cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html
@@ -77,7 +77,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
 	private String codigo;
  
 	/** Atributo nome. */
-	@JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class })
+	@JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class, Views.UnidadeProcessoListView.class  })
 	private String nome;
  
 	/** Atributo observacao. */
@@ -100,7 +100,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
 	private Boolean permitirUsarComoClassificacao;
  
 	@Transient
-	@JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class })
+	@JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class})
 	private String assunto;
  
 	/** Atributo tipoDestinacao. */
@@ -135,7 +135,7 @@ public class Processo extends PersistentObjectUnidade {
  
 	/** Atributo assunto. */
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JsonView({ Views.ProcessoList.class })
+	@JsonView({ Views.ProcessoList.class, Views.UnidadeProcessoListView.class })
 	private PlanoClassificacao assunto;
  
 	@JsonView({ Views.ProcessoEdit.class })
@@ -5,6 +5,8 @@ citApp.controller(&#39;GerenciarProcessoListUnidadeController&#39;, [&#39;$scope&#39;, &#39;workflow
  
 	$scope.$showAdvancedFilters = false;
  
+	$scope.processo = {};
+	
 	$scope.headers = [ {
 		title : $translate.instant('ECM.LABEL.PROTOCOLO'),
 		value : 'processo.nup'
@@ -12,6 +14,9 @@ citApp.controller(&#39;GerenciarProcessoListUnidadeController&#39;, [&#39;$scope&#39;, &#39;workflow
 		title : $translate.instant('ECM.LABEL.TIPOPROCESSO'),
 		value : 'processo.tipoProcesso.descricao'
 	}, {
+		title : $translate.instant('ECM.LABEL.ASSUNTO'),
+		value : 'processo.assunto.nome'
+	}, {
 		title : $translate.instant('ECM.LABEL.ATRIBUIDOA'),
 		value : 'usuarioResponsavel.username'
 	}, {
@@ -36,10 +41,11 @@ citApp.controller(&#39;GerenciarProcessoListUnidadeController&#39;, [&#39;$scope&#39;, &#39;workflow
 		dir : 'asc',
 		sort : 'processo.nup',
 		limit : 10,
-		fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia'],
+		fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'processo.assunto.nome','usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia', 'processo'],
 		filters : [
 		           { type : 'string', field : 'processo.nup'},
 		           { type : 'string', field : 'processo.tipoProcesso.descricao'},
+		           { type : 'string', field : 'processo.assunto.nome'},
 		           { type : 'string', field : 'usuarioResponsavel.username'},
 		           { type : 'string', field : 'processo.status.descricao', listaDominio : []},
 		           { type : 'string', field : 'processo.sigilo.tipoSigilo.descricao'},
@@ -64,4 +70,8 @@ citApp.controller(&#39;GerenciarProcessoListUnidadeController&#39;, [&#39;$scope&#39;, &#39;workflow
  
 	carregarDominiosStatusProcesso();
  
+	$scope.obterTransclude = function() {
+		$scope.modelSelecionado = $scope.$$childTail.modelParent;
+	};
+	
 }]);
 \ No newline at end of file
@@ -18,8 +18,7 @@
 	<breadcrumb ng-workspace="workspace"></breadcrumb>
  
 	<list-view ng-lista="processos" ng-repository="UnidadeProcessoRepository" ng-headers="headers" ng-filter-criteria="filterCriteria" 
-		ng-exibir-coluna-selecao="false" transclude="tarefasPorProcesso.html">
-		<div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/tarefasPorProcesso.html'"></div>
-		
+		ng-exibir-coluna-selecao="false" transclude="tarefasPorProcesso.html" ng-model-parent="modelSelecionado" ng-custom-transclude="obterTransclude()">
+			<div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/tarefasPorProcesso.html'"></div>
 	</list-view>
 </div>
 \ No newline at end of file
  
-<table class="table table-bordered table-striped" style="width: 90%; margin-left: 5%; margin-right: 1%; margin-bottom: 1%; margin-top: 1%">
-	<tr>
-		<td>Tarefa</td>
-		<td>BPE</td>
-	</tr>
-	<tr>
-		<td>vaiii</td>
-		<td>curinthia</td>
-	</tr>
-</table>
+<fieldset style="margin-left: 5%; width: 90%">
+      
+     <legend>
+     	<div class="pull-left">
+     	</div>
+     	<div class="pull-right">
+     		<translate>LABEL.DATA_DE_CRIACAO</translate>: {{modelSelecionado.processo.dataCriacao | filter : 'dateBR'}}
+     		<translate>LABEL.DATA_RECEBIMENTO</translate>: {{modelSelecionado.processo.dataReferencia}}
+     	</div>
+     </legend> 
+      
+	<div class="row" style="margin-top: 6px; margin-bottom: -25px;">
+		<div class="panel panel-default">
+			<div class="panel-heading clearfix">
+				<button class="btn btn-clear" title="{{$translate.instant('LABEL.EXECUTAR')}}" alt="{{$translate.instant('LABEL.EXECUTAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-play-circle-o green"></i>
+					<translate>LABEL.EXECUTAR</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('PORTAL.LABEL.CAPTURAR')}}" alt="{{$translate.instant('PORTAL.LABEL.CAPTURAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-thumb-tack orange"></i>
+					<translate>PORTAL.LABEL.CAPTURAR</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('ESI.PERMISSAO.DELEGAR')}}" alt="{{$translate.instant('ESI.PERMISSAO.DELEGAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-users blue"></i>
+					<translate>ESI.PERMISSAO.DELEGAR</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('ESI.PERMISSAO.SUSPENDER')}}" alt="{{$translate.instant('ESI.PERMISSAO.SUSPENDER')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-pause red"></i>
+					<translate>ESI.PERMISSAO.SUSPENDER</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('LABEL.REATIVAR')}}" alt="{{$translate.instant('LABEL.REATIVAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-play green"></i>
+					<translate>LABEL.REATIVAR</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('PORTAL.LABEL.VISUALIZAR_FLUXO')}}" alt="{{$translate.instant('PORTAL.LABEL.VISUALIZAR_FLUXO')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-search blue"></i>
+					<translate>PORTAL.LABEL.VISUALIZAR_FLUXO</translate>
+				</button>
+				<button class="btn btn-clear" title="{{$translate.instant('ESI.LOG.CONSULTA_LOG')}}" alt="{{$translate.instant('ESI.LOG.CONSULTA_LOG')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
+					<i class="fa fa-history yellow-dark"></i>
+					<translate>ESI.LOG.CONSULTA_LOG</translate>
+				</button>
+			</div>	
+			<div class="panel-body">
+			
+				<table class="table table-striped table-bordered table-hover" style="width: 100%; margin-left: 0%; margin-right: 1%; margin-bottom: 1%; margin-top: 1%">
+					<thead>
+						 <tr>
+						 	<th style="width: 5%;"></th>
+							<th colspan="2" style="width: 60%;"><small><translate>ESI.TAREFA</translate></small></th>
+							<th style="align:center;"><small><translate>PORTAL.LABEL.SITUACAO_INSTANCIA</translate></small></th>
+				         </tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td class="text-center" style="width: 5%;">
+								<input type="radio" name="modelChecked" ng-value="tarefa" ng-model="$parent.tarefaSelecionada" />
+							</td>
+							<td class="text-center" style="width: 5%;">
+								<span class="small green" >123456{{assignment.id}}</span>
+							</td>
+							<td>
+								<span class="small green">cassimiro{{assignment.flowElement.name}}</span>									
+							</td>
+							<td>
+								<span class="small green">teste{{assignment.processInstance.businessProcess.description}}</span>
+							</td>
+						</tr>
+				<!-- 		<tr ng-show="totalItens <= 0"> -->
+				<!-- 			<td colspan="9"> -->
+				<!-- 				<strong><translate>MSG.NENHUM_REGISTRO_ENCONTRADO</translate></strong> -->
+				<!-- 			</td> -->
+				<!-- 		</tr>	 -->
+					</tbody>							
+				</table>
+			
+			</div>
+		</div>
+	</div>	
+		
+</fieldset>
 \ No newline at end of file
...	...	@@ -77,7 +77,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
77	77	private String codigo;
78	78
79	79	/** Atributo nome. */
80		- @JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class })
	80	+ @JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class, Views.UnidadeProcessoListView.class })
81	81	private String nome;
82	82
83	83	/** Atributo observacao. */
...	...	@@ -100,7 +100,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme
100	100	private Boolean permitirUsarComoClassificacao;
101	101
102	102	@Transient
103		- @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class })
	103	+ @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class})
104	104	private String assunto;
105	105
106	106	/** Atributo tipoDestinacao. */
...	...
...	...	@@ -135,7 +135,7 @@ public class Processo extends PersistentObjectUnidade {
135	135
136	136	/** Atributo assunto. */
137	137	@ManyToOne(fetch = FetchType.LAZY)
138		- @JsonView({ Views.ProcessoList.class })
	138	+ @JsonView({ Views.ProcessoList.class, Views.UnidadeProcessoListView.class })
139	139	private PlanoClassificacao assunto;
140	140
141	141	@JsonView({ Views.ProcessoEdit.class })
...	...
...	...	@@ -5,6 +5,8 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow
5	5
6	6	$scope.$showAdvancedFilters = false;
7	7
	8	+ $scope.processo = {};
	9	+
8	10	$scope.headers = [ {
9	11	title : $translate.instant('ECM.LABEL.PROTOCOLO'),
10	12	value : 'processo.nup'
...	...	@@ -12,6 +14,9 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow
12	14	title : $translate.instant('ECM.LABEL.TIPOPROCESSO'),
13	15	value : 'processo.tipoProcesso.descricao'
14	16	}, {
	17	+ title : $translate.instant('ECM.LABEL.ASSUNTO'),
	18	+ value : 'processo.assunto.nome'
	19	+ }, {
15	20	title : $translate.instant('ECM.LABEL.ATRIBUIDOA'),
16	21	value : 'usuarioResponsavel.username'
17	22	}, {
...	...	@@ -36,10 +41,11 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow
36	41	dir : 'asc',
37	42	sort : 'processo.nup',
38	43	limit : 10,
39		- fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia'],
	44	+ fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'processo.assunto.nome','usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia', 'processo'],
40	45	filters : [
41	46	{ type : 'string', field : 'processo.nup'},
42	47	{ type : 'string', field : 'processo.tipoProcesso.descricao'},
	48	+ { type : 'string', field : 'processo.assunto.nome'},
43	49	{ type : 'string', field : 'usuarioResponsavel.username'},
44	50	{ type : 'string', field : 'processo.status.descricao', listaDominio : []},
45	51	{ type : 'string', field : 'processo.sigilo.tipoSigilo.descricao'},
...	...	@@ -64,4 +70,8 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow
64	70
65	71	carregarDominiosStatusProcesso();
66	72
	73	+ $scope.obterTransclude = function() {
	74	+ $scope.modelSelecionado = $scope.$$childTail.modelParent;
	75	+ };
	76	+
67	77	}]);
68	78	\ No newline at end of file
...	...
...	...	@@ -18,8 +18,7 @@
18	18	<breadcrumb ng-workspace="workspace"></breadcrumb>
19	19
20	20	<list-view ng-lista="processos" ng-repository="UnidadeProcessoRepository" ng-headers="headers" ng-filter-criteria="filterCriteria"
21		- ng-exibir-coluna-selecao="false" transclude="tarefasPorProcesso.html">
22		- <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/tarefasPorProcesso.html'"></div>
23		-
	21	+ ng-exibir-coluna-selecao="false" transclude="tarefasPorProcesso.html" ng-model-parent="modelSelecionado" ng-custom-transclude="obterTransclude()">
	22	+ <div ng-include src="'/cit-ecm-web/html/gerenciarProcesso/tarefasPorProcesso.html'"></div>
24	23	</list-view>
25	24	</div>
26	25	\ No newline at end of file
...	...
1	1
2		-<table class="table table-bordered table-striped" style="width: 90%; margin-left: 5%; margin-right: 1%; margin-bottom: 1%; margin-top: 1%">
3		- <tr>
4		- <td>Tarefa</td>
5		- <td>BPE</td>
6		- </tr>
7		- <tr>
8		- <td>vaiii</td>
9		- <td>curinthia</td>
10		- </tr>
11		-</table>
	2	+<fieldset style="margin-left: 5%; width: 90%">
	3	+
	4	+ <legend>
	5	+ <div class="pull-left">
	6	+ </div>
	7	+ <div class="pull-right">
	8	+ <translate>LABEL.DATA_DE_CRIACAO</translate>: {{modelSelecionado.processo.dataCriacao \| filter : 'dateBR'}}
	9	+ <translate>LABEL.DATA_RECEBIMENTO</translate>: {{modelSelecionado.processo.dataReferencia}}
	10	+ </div>
	11	+ </legend>
	12	+
	13	+ <div class="row" style="margin-top: 6px; margin-bottom: -25px;">
	14	+ <div class="panel panel-default">
	15	+ <div class="panel-heading clearfix">
	16	+ <button class="btn btn-clear" title="{{$translate.instant('LABEL.EXECUTAR')}}" alt="{{$translate.instant('LABEL.EXECUTAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	17	+ <i class="fa fa-play-circle-o green"></i>
	18	+ <translate>LABEL.EXECUTAR</translate>
	19	+ </button>
	20	+ <button class="btn btn-clear" title="{{$translate.instant('PORTAL.LABEL.CAPTURAR')}}" alt="{{$translate.instant('PORTAL.LABEL.CAPTURAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	21	+ <i class="fa fa-thumb-tack orange"></i>
	22	+ <translate>PORTAL.LABEL.CAPTURAR</translate>
	23	+ </button>
	24	+ <button class="btn btn-clear" title="{{$translate.instant('ESI.PERMISSAO.DELEGAR')}}" alt="{{$translate.instant('ESI.PERMISSAO.DELEGAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	25	+ <i class="fa fa-users blue"></i>
	26	+ <translate>ESI.PERMISSAO.DELEGAR</translate>
	27	+ </button>
	28	+ <button class="btn btn-clear" title="{{$translate.instant('ESI.PERMISSAO.SUSPENDER')}}" alt="{{$translate.instant('ESI.PERMISSAO.SUSPENDER')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	29	+ <i class="fa fa-pause red"></i>
	30	+ <translate>ESI.PERMISSAO.SUSPENDER</translate>
	31	+ </button>
	32	+ <button class="btn btn-clear" title="{{$translate.instant('LABEL.REATIVAR')}}" alt="{{$translate.instant('LABEL.REATIVAR')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	33	+ <i class="fa fa-play green"></i>
	34	+ <translate>LABEL.REATIVAR</translate>
	35	+ </button>
	36	+ <button class="btn btn-clear" title="{{$translate.instant('PORTAL.LABEL.VISUALIZAR_FLUXO')}}" alt="{{$translate.instant('PORTAL.LABEL.VISUALIZAR_FLUXO')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	37	+ <i class="fa fa-search blue"></i>
	38	+ <translate>PORTAL.LABEL.VISUALIZAR_FLUXO</translate>
	39	+ </button>
	40	+ <button class="btn btn-clear" title="{{$translate.instant('ESI.LOG.CONSULTA_LOG')}}" alt="{{$translate.instant('ESI.LOG.CONSULTA_LOG')}}" type="button" ng-click="dadosBemPatrimonial.$showInconsistencias = false" >
	41	+ <i class="fa fa-history yellow-dark"></i>
	42	+ <translate>ESI.LOG.CONSULTA_LOG</translate>
	43	+ </button>
	44	+ </div>
	45	+ <div class="panel-body">
	46	+
	47	+ <table class="table table-striped table-bordered table-hover" style="width: 100%; margin-left: 0%; margin-right: 1%; margin-bottom: 1%; margin-top: 1%">
	48	+ <thead>
	49	+ <tr>
	50	+ <th style="width: 5%;"></th>
	51	+ <th colspan="2" style="width: 60%;"><small><translate>ESI.TAREFA</translate></small></th>
	52	+ <th style="align:center;"><small><translate>PORTAL.LABEL.SITUACAO_INSTANCIA</translate></small></th>
	53	+ </tr>
	54	+ </thead>
	55	+ <tbody>
	56	+ <tr>
	57	+ <td class="text-center" style="width: 5%;">
	58	+ <input type="radio" name="modelChecked" ng-value="tarefa" ng-model="$parent.tarefaSelecionada" />
	59	+ </td>
	60	+ <td class="text-center" style="width: 5%;">
	61	+ <span class="small green" >123456{{assignment.id}}</span>
	62	+ </td>
	63	+ <td>
	64	+ <span class="small green">cassimiro{{assignment.flowElement.name}}</span>
	65	+ </td>
	66	+ <td>
	67	+ <span class="small green">teste{{assignment.processInstance.businessProcess.description}}</span>
	68	+ </td>
	69	+ </tr>
	70	+ <!-- <tr ng-show="totalItens <= 0"> -->
	71	+ <!-- <td colspan="9"> -->
	72	+ <!-- <strong><translate>MSG.NENHUM_REGISTRO_ENCONTRADO</translate></strong> -->
	73	+ <!-- </td> -->
	74	+ <!-- </tr> -->
	75	+ </tbody>
	76	+ </table>
	77	+
	78	+ </div>
	79	+ </div>
	80	+ </div>
	81	+
	82	+</fieldset>
12	83	\ No newline at end of file
...	...