mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Fix store and improve search
This commit is contained in:
@@ -350,7 +350,6 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
async openOptions(taskAction?: any) {
|
||||
const popover = await this.popoverController.create({
|
||||
component: OptsExpedientePage,
|
||||
@@ -365,6 +364,4 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
return await popover.present();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
<div class="content ion-align-items-center">
|
||||
|
||||
<div class="d-flex ion-justify-content-between ">
|
||||
<span class="result-name">{{ searchDocument.Assunto}}</span>
|
||||
<span class="result-name">{{ searchDocument.Assunto}} -- {{ searchDocument.ApplicationType}} </span>
|
||||
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
|
||||
</div>
|
||||
<div class="d-flex ion-justify-content-between ">
|
||||
|
||||
@@ -11,6 +11,9 @@ import { slugify } from 'src/plugin/javascript-remove-accents.js';
|
||||
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
|
||||
import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
|
||||
import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
|
||||
import { ExpedientTaskModalPage } from '../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
|
||||
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
|
||||
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
|
||||
|
||||
|
||||
@Component({
|
||||
@@ -561,7 +564,6 @@ export class SearchPage implements OnInit {
|
||||
|
||||
const ApplicationType = searchDocument.ApplicationType.toString()
|
||||
const Id = searchDocument.Id
|
||||
|
||||
if(this.select == false){
|
||||
if(this.type == "Agenda") {
|
||||
|
||||
@@ -580,13 +582,13 @@ export class SearchPage implements OnInit {
|
||||
this.viewPublicationDetail(Id);
|
||||
}
|
||||
else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
|
||||
console.log('OPEN DOC');
|
||||
this.viewDocumentDetail(Id, ApplicationType);
|
||||
|
||||
if(ApplicationType == '8' || ApplicationType == '361') {
|
||||
this.viewDocumentDetail(Id, ApplicationType);
|
||||
// this.openExpedientActionsModal(searchDocument)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async viewPublicationDetail(publicationId:string) {
|
||||
@@ -606,7 +608,8 @@ export class SearchPage implements OnInit {
|
||||
|
||||
async viewDocumentDetail(docId:string, applicationId:string) {
|
||||
let classs;
|
||||
if( window.innerWidth <= 800){
|
||||
|
||||
if( window.innerWidth <= 800) {
|
||||
classs = 'modal modal-desktop'
|
||||
} else {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
@@ -621,8 +624,36 @@ export class SearchPage implements OnInit {
|
||||
cssClass: classs,
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then((res)=>{
|
||||
modal.onDidDismiss().then((res)=>{});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
async openExpedientActionsModal(doc: any) {
|
||||
|
||||
let customTask = {
|
||||
serialNumber: doc.SourceId,
|
||||
taskStartDate: doc.CreateDate,
|
||||
isEvent: true,
|
||||
workflowInstanceDataFields: {
|
||||
FsId: doc.ApplicationId,
|
||||
FolderID: null,
|
||||
DocId: doc.SourceId,
|
||||
Subject: doc.SourceName
|
||||
},
|
||||
}
|
||||
|
||||
const popover = await this.modalController.create({
|
||||
component: OptsExpedientePage,
|
||||
cssClass: 'model aside-modal search-submodal',
|
||||
componentProps: {
|
||||
fulltask: customTask,
|
||||
task: customTask
|
||||
},
|
||||
//translucent: true
|
||||
});
|
||||
return await popover.present();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user