mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
fix add atachment in Expediente
This commit is contained in:
+6
-5
@@ -432,7 +432,7 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
component: SearchPage,
|
||||
cssClass: 'modal-width-100-width-background modal',
|
||||
componentProps: {
|
||||
type: 'AccoesPresidenciais & ArquivoDespachoElect',
|
||||
type: 'Correspondencia',
|
||||
showSearchInput: true,
|
||||
select: true,
|
||||
findOnly: [8]
|
||||
@@ -458,7 +458,7 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
body.Attachments = Attachments;
|
||||
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
|
||||
try {
|
||||
loader.remove()
|
||||
await this.attachmentsService.AddAttachment(body).toPromise()
|
||||
@@ -467,11 +467,12 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
this.toastService._badRequest()
|
||||
}
|
||||
});
|
||||
|
||||
this.LoadTaskDetail(this.serialNumber);
|
||||
}
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.LoadTaskDetail(this.serialNumber);
|
||||
}, 5000);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
async openExpedientActionsModal(taskAction: any, task: any) {
|
||||
|
||||
@@ -177,10 +177,10 @@
|
||||
<ul>
|
||||
<li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex cursor-pointer">
|
||||
<div class="icon">
|
||||
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'default' "
|
||||
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' && ThemeService.currentTheme == 'default' "
|
||||
src="assets/images/icons-search-document.svg"></ion-icon>
|
||||
|
||||
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' && ThemeService.currentTheme == 'gov'"
|
||||
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' && ThemeService.currentTheme == 'gov'"
|
||||
src="assets/images/theme/gov/icons-search-document.svg"></ion-icon>
|
||||
|
||||
<ion-icon *ngIf="itemIcons() == 'Agenda' "
|
||||
@@ -192,7 +192,7 @@
|
||||
|
||||
<div class="d-flex ion-justify-content-between ">
|
||||
<span class="result-name">{{ searchDocument.Assunto}}</span>
|
||||
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
|
||||
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' ">{{ searchDocument.appName}}</span>
|
||||
</div>
|
||||
<div class="d-flex ion-justify-content-between ">
|
||||
<span class="organic-entity">{{ searchDocument.EntidadeOrganicaNome }}</span>
|
||||
|
||||
@@ -243,7 +243,8 @@ export class SearchPage implements OnInit {
|
||||
this.loadWordCloud();
|
||||
|
||||
});
|
||||
} else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
|
||||
}
|
||||
else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
|
||||
|
||||
this.showLoader = true;
|
||||
|
||||
@@ -319,7 +320,7 @@ export class SearchPage implements OnInit {
|
||||
});
|
||||
|
||||
} else {
|
||||
let counter = 0;
|
||||
let counter = 0;
|
||||
|
||||
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
|
||||
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
|
||||
@@ -385,11 +386,93 @@ export class SearchPage implements OnInit {
|
||||
}
|
||||
this.loadWordCloud();
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else if (this.type == "AccoesPresidenciais"){
|
||||
else if ( this.type == "Correspondencia"){
|
||||
|
||||
this.showLoader = true;
|
||||
|
||||
this.searchCategories = [];
|
||||
this.searchDocuments = [];
|
||||
this.showSearchDocuments = [];
|
||||
|
||||
if(this.select) {
|
||||
|
||||
let counter = 0;
|
||||
|
||||
this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
|
||||
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
|
||||
|
||||
res.Categories.forEach( e => {
|
||||
e['Active'] = false;
|
||||
this.searchCategories.push(e)
|
||||
});
|
||||
|
||||
// bind respose
|
||||
|
||||
this.sortArrayISODate(res.Documents).forEach(e => {
|
||||
e['appName'] = 'Correspondencia'
|
||||
this.searchDocuments.push(e)
|
||||
});
|
||||
|
||||
this.reorderList(this.ordinance);
|
||||
|
||||
// hide show document
|
||||
if(this.searchDocuments.length >= 1){
|
||||
this.showDocuments = true;
|
||||
} else {
|
||||
this.showDocuments = false
|
||||
}
|
||||
counter++;
|
||||
|
||||
if(counter ==2){
|
||||
this.showLoader = false;
|
||||
}
|
||||
this.showLoader = false;
|
||||
this.loadWordCloud();
|
||||
});
|
||||
|
||||
} else {
|
||||
let counter = 0;
|
||||
|
||||
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
|
||||
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
|
||||
|
||||
res.Categories.forEach( e => {
|
||||
e['Active'] = false;
|
||||
this.searchCategories.push(e)
|
||||
});
|
||||
|
||||
// bind respose
|
||||
|
||||
this.sortArrayISODate(res.Documents).forEach(e => {
|
||||
e['appName'] = 'Correspondencia'
|
||||
this.searchDocuments.push(e)
|
||||
});
|
||||
|
||||
this.reorderList(this.ordinance);
|
||||
|
||||
// hide show document
|
||||
if(this.searchDocuments.length >= 1){
|
||||
this.showDocuments = true;
|
||||
} else {
|
||||
this.showDocuments = false
|
||||
}
|
||||
|
||||
counter++;
|
||||
|
||||
if(counter ==2){
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
this.loadWordCloud();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
else if (this.type == "AccoesPresidenciais"){
|
||||
|
||||
this.showLoader = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user