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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-04-21 16:45:17 +01:00
parent 92c50e0d4a
commit 4a3b83e6c5
14 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+5 -5
View File
@@ -205,7 +205,7 @@ export class EditEventPage implements OnInit {
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required
]),
Date: new FormControl(new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
Validators.required
]),
@@ -390,21 +390,21 @@ export class EditEventPage implements OnInit {
}
setIntervenient(data){
setIntervenient(data) {
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
setIntervenientCC(data){
setIntervenientCC(data) {
this.taskParticipantsCc = data;
}
addParticipants(){
addParticipants() {
this.adding = 'intervenient'
this.openAttendees();
}
addParticipantsCC(){
addParticipantsCC() {
this.adding = 'CC';
this.openAttendees();
}
src/app/pages/agenda/view-event/view-event.page.html
+2 -3
View File
@@ -39,14 +39,13 @@
<div class="content-location">
<span class="date">{{loadedEvent.Location}}</span>
<div *ngIf="loadedEvent.Organizer">
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
<div *ngIf="eventsService.isMyEvent(loadedEvent) == false">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
</div>
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
<div *ngIf="eventsService.isMyEvent(loadedEvent) == true">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
</div>
src/app/pages/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -61,7 +61,7 @@ export class ViewEventPage implements OnInit {
constructor(
private modalController: ModalController,
/* private navParams: NavParams, */
private eventsService: EventsService,
public eventsService: EventsService,
private attachmentsService: AttachmentsService,
public alertController: AlertController,
private iab: InAppBrowser,
src/app/services/events.service.ts
+20
View File
@@ -190,6 +190,26 @@ export class EventsService {
}
isMyEvent(event: any) {
for (let calendar of this.loggeduser.OwnerCalendars) {
if(event.CalendarId == calendar.CalendarId) {
return true
}
}
for (let sharedCalendar of this.loggeduser.SharedCalendars) {
if(event.CalendarId == sharedCalendar.CalendarId) {
return false
}
}
return false
}
getAllPrOficialEvents(startdate: string, enddate: string): Observable<EventList[]> {
let geturl = environment.apiURL + 'calendar/pr';
geturl = geturl.replace('/V4/', '/V5/')
src/app/shared/agenda/edit-event/edit-event.page.ts
+1 -1
View File
@@ -194,7 +194,7 @@ export class EditEventPage implements OnInit {
participantes: new FormControl(this.taskParticipants, [
// Validators.required
]),
Date: new FormControl( new Date(this.postEvent.StartDate).toLocaleString('pt') < new Date(this.postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
Date: new FormControl( new Date(this.postEvent.StartDate).toLocaleString('pt') <= new Date(this.postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
Validators.required
]),
src/app/shared/agenda/view-event/view-event.page.html
+2 -2
View File
@@ -36,12 +36,12 @@
<span class="date">{{loadedEvent.Location}}</span>
<div *ngIf="loadedEvent.Organizer">
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
<div *ngIf="eventsService.isMyEvent(loadedEvent) == false">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
</div>
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
<div *ngIf="eventsService.isMyEvent(loadedEvent) == true">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
</div>
src/app/shared/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export class ViewEventPage implements OnInit {
sesseionStora = SessionStore
constructor(
private eventsService: EventsService,
public eventsService: EventsService,
public alertController: AlertController,
private iab: InAppBrowser,
private processes: ProcessesService,
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1 -1
View File
@@ -30,7 +30,7 @@
(click)="viewExpedientDetail(task.SerialNumber)" -->
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of diplomasList"
*ngFor = "let task of deplomasStore.diplomasAssinadoList"
(click)="goToDiploma(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -24,7 +24,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment">
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsPRList">
<div *ngSwitchCase="'MDGPR'" class="height-100">
src/app/shared/gabinete-digital/expedients/expedients.page.html
+2 -2
View File
@@ -22,10 +22,10 @@
<div class="content width-100 overflow-y-auto height-100" >
<div >
<ion-list *ngIf="taskslist.length >=0">
<ion-list *ngIf="expedientegbstore.list.length >=0">
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of taskslist"
*ngFor = "let task of expedientegbstore.list"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+1 -1
View File
@@ -89,7 +89,7 @@ export class PedidosPage implements OnInit {
this.parecerList = new Array();
allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
let task: customTask = this.customTaskPipe.transform(element);
this.parecerList.push(task);
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -20,7 +20,7 @@
</ion-refresher>
<app-task-list
[taskList] = listToPresent
[taskList] = pendentesstore.list
[skeletonLoader] = skeletonLoader
(viewTaskDetail)="viewTaskDetails($event)"
> </app-task-list>
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -95,7 +95,7 @@ getFromDb() {
async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
console.log(SerialNumber, WorkflowName, activityInstanceName)
// console.log(SerialNumber, WorkflowName, activityInstanceName)
if(WorkflowName == 'Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
src/environments/environment.ts
+6 -6
View File
@@ -21,12 +21,12 @@
export const environment = {
production: false,
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
/* apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', */
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/',
//apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
//apiChatUrl: 'https://www.tabularium.pt/api/v1/',
//apiWsChatUrl: 'wss://www.tabularium.pt/websocket',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local', //gabinetedigital.local
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local