- {{ searchDocument.Assunto}}
+ {{ searchDocument.Assunto}} -- {{ searchDocument.ApplicationType}}
{{ searchDocument.appName}}
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 15c6a5231..5f052511f 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -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();
}
}
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index 28303ccaa..9e07f74d4 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -8,9 +8,7 @@ import { Event } from 'src/app/models/event.model';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
-import { momentG } from 'src/plugin/momentG';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
-import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
import { ToastService } from 'src/app/services/toast.service';
import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index f36d1d798..6cb188cf5 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -15,68 +15,70 @@ export class EventoaprovacaoStoreService {
private keyNamepr: string;
private _count = 0
- constructor() {
+ constructor() {
- this.keyNamemd = (SHA1(this.constructor.name+"md")).toString()
- this.keyNamepr = (SHA1(this.constructor.name+"pr")).toString()
-
-
- setTimeout(()=>{
- let restoremd = localstoreService.get(this.keyNamemd, {})
- let restorepr = localstoreService.get(this.keyNamepr, {})
- this._listpr = restorepr.eventsListpr || []
- this._listmd = restoremd.eventsListmd || []
- this._count = restorepr.count.length + restoremd.count.length || 0
- }, 10)
+ this.keyNamemd = (SHA1(this.constructor.name+"md")).toString()
+ this.keyNamepr = (SHA1(this.constructor.name+"pr")).toString()
+
+
+ setTimeout(()=>{
+ let restoremd = localstoreService.get(this.keyNamemd, {})
+ let restorepr = localstoreService.get(this.keyNamepr, {})
- }
+ this._listpr = restorepr.eventsListpr || []
+ this._listmd = restoremd.eventsListmd || []
+ this._count = this._listpr.length + this._listmd.length || 0
+ }, 10)
- get listpr() {
- return this._listpr
- }
+ }
- get listmd() {
- return this._listmd
-}
- get count() {
- return this._count
- }
- set count(value: number) {
- this._count = value
- }
+ get listpr() {
+ return this._listpr
+ }
- resetpr(eventsList: any) {
- this._listpr = eventsList
-
- this.count = this._listmd.length + this.listpr.length
- this.savepr(this._listpr)
- }
-
- resetmd(eventsList: any) {
- this._listmd = eventsList
-
- this.count = this._listmd.length + this.listpr.length
- this.savemd(this._listmd)
-}
- private savemd(eventsListmd: any) {
- setTimeout(()=>{
- localstoreService.set(this.keyNamemd,{
- eventsListmd,
- count: this._listmd,
- })
- }, 10)
-
- }
-
- private savepr(eventsListpr: any) {
- setTimeout(()=>{
- localstoreService.set(this.keyNamepr,{
- eventsListpr,
- count: this._listpr,
- })
- }, 10)
+ get listmd() {
+ return this._listmd
+ }
-}
+ get count() {
+ return this._count
+ }
+
+ set count(value: number) {
+ this._count = value
+ }
+
+ resetpr(eventsList: any) {
+ this._listpr = eventsList
+
+ this.count = this._listmd.length + this.listpr.length
+ this.savepr(this._listpr)
+ }
+
+ resetmd(eventsList: any) {
+ this._listmd = eventsList
+
+ this.count = this._listmd.length + this.listpr.length
+ this.savemd(this._listmd)
+ }
+
+ private savemd(eventsListmd: any) {
+ setTimeout(()=>{
+ localstoreService.set(this.keyNamemd,{
+ eventsListmd,
+ })
+ }, 10)
+
+ }
+
+ private savepr(eventsListpr: any) {
+ setTimeout(()=>{
+ localstoreService.set(this.keyNamepr,{
+ eventsListpr,
+ })
+ }, 10)
+
+ }
}
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index 9a406ca56..9e662c955 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -7,51 +7,50 @@ import { AES, enc, SHA1 } from 'crypto-js'
})
export class ExpedientegdStoreService {
-// main data
-private _list: Event[]
-// local storage keyName
-private keyName: string;
-private _count = 0
+ // main data
+ private _list: Event[]
+ // local storage keyName
+ private keyName: string;
+ private _count = 0
-constructor() {
+ constructor() {
- this.keyName = (SHA1(this.constructor.name)).toString()
-
-
- setTimeout(()=>{
- let restore = localstoreService.get(this.keyName, {})
- this._list = restore.eventsList || []
- this._count = restore.count || 0
- }, 10)
+ this.keyName = (SHA1(this.constructor.name)).toString()
+
+ setTimeout(()=>{
+ let restore = localstoreService.get(this.keyName, {})
+ this._list = restore.eventsList || []
+ this._count = restore.count || 0
+ }, 10)
-}
+ }
-get list() {
- return this._list
-}
-get count() {
- return this._count
-}
-set count(value: number) {
- this._count = value
-}
+ get list() {
+ return this._list
+ }
+ get count() {
+ return this._count
+ }
+ set count(value: number) {
+ this._count = value
+ }
-reset(eventsList: any) {
- this._list = eventsList
+ reset(eventsList: any) {
+ this._list = eventsList
- this.count = this._list.length
- this.save(this._list)
-}
+ this.count = this._list.length
+ this.save(this._list)
+ }
-private save(eventsList: any) {
- setTimeout(()=>{
- localstoreService.set(this.keyName,{
- eventsList,
- count: this._list.length
- })
- }, 10)
-
-}
+ private save(eventsList: any) {
+ setTimeout(()=>{
+ localstoreService.set(this.keyName,{
+ eventsList,
+ count: this._list.length
+ })
+ }, 10)
+
+ }
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4f006b22a..3648e6bf2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,8 +4,8 @@
export const environment = {
production: false,
- apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
- /* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', */
+ //apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
+ apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local', //gabinetedigital.local
diff --git a/test/Agenda.spec.ts b/test/Agenda.spec.ts
index 2d72416a0..14debd250 100644
--- a/test/Agenda.spec.ts
+++ b/test/Agenda.spec.ts
@@ -56,8 +56,6 @@ describe('Puppeteer tests', () => {
// wait for component
await page.waitForSelector('app-new-event')
-
-
// subject
await page.type('app-new-event .ion-item-container input', faker.commerce.productDescription() )
// Location