-
+
@@ -56,7 +56,7 @@
-

Sexta, 14 de Abril{{LoadedDocument.Type}}

+

{{customDate}}{{LoadedDocument.Type}}

@@ -80,9 +80,9 @@
Documentos Anexados
+ (click)="viewDocument()">

{{LoadedDocument.Subject}}

-

{{LoadedDocument.UserName}}

+
@@ -91,17 +91,17 @@
- - + +
- - - - + + + +
- - - + + +
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index b03015bd6..cf43adca6 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -11,9 +11,14 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; }) export class DocumentDetailPage implements OnInit { + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + customDate:any; + docId: string; applicationId:string; - LoadedDocument:any; + LoadedDocument:any = null; constructor( private navParams: NavParams, @@ -37,6 +42,9 @@ export class DocumentDetailPage implements OnInit { this.processes.GetDocumentDetails(this.docId, '').subscribe(res=>{ console.log(res); this.LoadedDocument = res[0]; + + let thedate = new Date(this.LoadedDocument.DateDocument); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); }); } @@ -57,5 +65,8 @@ export class DocumentDetailPage implements OnInit { close(){ this.modalController.dismiss(); } + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index a7d6b17b7..f3640212c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -74,7 +74,7 @@
-

Sexta, 14 de AbrilExpediente

+

{{customDate}}Expediente

Muitíssimo urgente

@@ -89,14 +89,16 @@
-
Com conhecimento
- - -
-

{{c.Name}}

-
-
-
+
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+
+
+
Detalhes

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index cef4cd329..0faf5dfbb 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -22,6 +22,11 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart }) export class ExpedienteDetailPage implements OnInit { + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + customDate:any; + task: any; fulltask: any; eventsList: Event[]; @@ -81,6 +86,11 @@ export class ExpedienteDetailPage implements OnInit { } this.fulltask = res; console.log(res); + + let thedate = new Date(this.task.CreateDate); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + + this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{ this.intervenientes = users.filter(user=>{ return user.Type == 'I'; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index f3310febe..dd8f6f8cf 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -26,10 +26,10 @@ export class SearchPage implements OnInit { searchDocTypeId: string; ordinance: string; - searchCategories: SearchCategory[]; - showSearchDocuments: SearchDocument[]; + searchCategories: SearchCategory[] = []; + showSearchDocuments: SearchDocument[] = []; showCategory: string; - searchDocuments: SearchDocument[]; + searchDocuments: SearchDocument[] =[]; showDocuments = false; showAdvanceSearch = false;