peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/gabinete-search

Browse Source
This commit is contained in:
Peter Maquiran
2023-05-26 14:23:37 +01:00
parent 0b3ffa3ea7
commit b2da8463b4
56 changed files with 98 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+1 -12
View File
@@ -238,14 +238,6 @@ export class AgendaPage implements OnInit {
this.tigerUpdate()
window['year'] = this.changeYear
console.log('SessionStore.user', SessionStore.user)
setTimeout(() =>{
console.log(this.TimelineMDList);
}, 500)
}
@@ -541,7 +533,7 @@ export class AgendaPage implements OnInit {
this.loadRangeEventRun(startTime, endTime)
} else {
// console.log('dont call')
}
}
@@ -587,9 +579,6 @@ export class AgendaPage implements OnInit {
label = "pr"
}
console.log('label', label)
// this.addEventToDB(response, label);
let eventsList = response;
this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId)
this.CalendarStore.pushEvent(eventsList, label);
src/app/pages/agenda/edit-event/edit-event.page.html
+1 -1
View File
@@ -38,7 +38,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
</div>
src/app/pages/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -54,7 +54,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
</div>
src/app/pages/events/events.page.ts
+9 -5
View File
@@ -86,11 +86,7 @@ export class EventsPage implements OnInit {
(async () =>{
this.loadingAllTask = true
await this.TaskService.LoadTask()
this.loadingAllTask = false
})()
this.loadAllTask();
window['zipPhoneCallback'] = function (zipphone) {
@@ -135,6 +131,12 @@ export class EventsPage implements OnInit {
}
async loadAllTask() {
this.loadingAllTask = true
await this.TaskService.LoadTask()
this.loadingAllTask = false
}
hideSearch() {
if (this.router.url == '/home/events') {
this.hideSearchBtn = true;
@@ -149,8 +151,10 @@ export class EventsPage implements OnInit {
} catch(error) {}
}, 2000);
}
this.RefreshEvents();
this.LoadList();
this.loadAllTask();
}
onSegmentChange() {
src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
+2 -1
View File
@@ -17,7 +17,8 @@ import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/t
IonicModule,
DespachoPageRoutingModule,
TaskDetailsPageModule
TaskDetailsPageModule,
SharedModule
],
declarations: [
DespachoPage,
src/app/pages/gabinete-digital/event-list/event-list.page.html
+2 -2
View File
@@ -85,10 +85,10 @@
<ion-list class="width-100 height-100" >
<div class="overflow-y-auto height-100">
<ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none"
<ion-item class="Rectangle cursor-pointer " lines="none"
*ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)">
<div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex overflow-hidden">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
src/app/pages/gabinete-digital/event-list/event-list.page.scss
+7 -5
View File
@@ -58,7 +58,7 @@ ion-item-sliding{
overflow: auto;
}
.content-pr-Pessoal{
background-color: var(--white);
background-color: vfar(--white);
border-radius: 5px;
border-right: 5px solid #958bfc;
border-left: unset !important;
@@ -77,9 +77,7 @@ ion-item-sliding{
overflow: auto;
}
.approve-event-time{
float: left;
}
.approve-event-time p{
width: 33px;
font-family: Roboto;
@@ -94,7 +92,6 @@ ion-item-sliding{
padding: 0;
}
.approve-event-detail{
float: left;
margin-left: 10px;
}
.approve-event-detail p{
@@ -136,4 +133,9 @@ ion-item-sliding{
border-radius: 17px;
color: white;
font-size: 10pt;
}
.overflow-hidden {
overflow: hidden
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -61,7 +61,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postData.Location"></ion-input>
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postData.Location"></ion-input>
</div>
</div>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -3
View File
@@ -221,8 +221,6 @@ export class GabineteDigitalPage implements OnInit {
}
}
console.log('order', this.ordinance)
}
ngOnInit() {
@@ -355,7 +353,7 @@ export class GabineteDigitalPage implements OnInit {
else if (activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
console.log('no route!')
}
}
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {