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

Agenda noclatura completed

Browse Source
This commit is contained in:
Eudes Inácio
2022-12-16 00:33:13 +01:00
parent 839062013b
commit 2b9e233ac9
13 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+2 -2
View File
@@ -61,8 +61,8 @@
<mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
<mat-option *ngFor="let calendars of _eventService.calendarNamesAry" value="{{calendars}}">
<div *ngIf="calendars != 'Meu calendario' "> Calendário de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> {{calendars}} </div>
<div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
</mat-option>
</mat-select>
src/app/pages/agenda/agenda.page.html
+13 -7
View File
@@ -219,8 +219,8 @@
<!-- List -->
<ul *ngIf="showTimelineFilterState">
<li class="changeText" [class.active]="segment == 'Combinado' " (click)="changeSegment('Combinado')" class="cursor-pointer">Todos</li>
<li class="changeText" [class.active]="segment == 'Oficial' " (click)="changeSegment('Oficial')" class="cursor-pointer">Oficial</li>
<li class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Pessoal</li>
<li class="changeText" [class.active]="segment == 'Oficial' " (click)="changeSegment('Oficial')" class="cursor-pointer">Calendário Oficial</li>
<li class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Calendário Pessoal</li>
</ul>
</ion-row>
@@ -228,11 +228,14 @@
<div class="calendar-title-container px-20 d-none d-md-flex">
<div class="calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center" *ngIf="eventService.hasOwnCalendar">
<div >Meu Calendário</div>
<div >Agenda de {{loggeduser.FullName}}</div>
</div>
<div class="calendar-title-description text-black align-center" *ngIf="eventService.hasSharedCalendar">
<div class="flex-grow-1 text-grey d-flex justify-center align-center">
<div >Calendário Partilhado</div>
<mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
<div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
</mat-option>
</div>
</div>
</div>
@@ -281,7 +284,8 @@
<div class="description">
<p class="m-0">{{event.event.Subject}}</p>
</div>
<div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
</div>
</div>
@@ -322,7 +326,8 @@
<div class="description">
<p class="m-0">{{event.event.Subject}}</p>
</div>
<div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
</div>
</div>
</div>
@@ -364,7 +369,8 @@
<div class="description">
<p class="m-0">{{event.event.Subject}}</p>
</div>
<div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
<div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'"> {{loggeduser.FullName}} </div>
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
</div>
</div>
src/app/pages/agenda/agenda.page.ts
+1 -1
View File
@@ -179,7 +179,7 @@ export class AgendaPage implements OnInit {
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
private storage:Storage,
public p: PermissionService
public p: PermissionService,
) {
this.dateAdapter.setLocale('es');
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -64,10 +64,10 @@
<mat-form-field appearance="none" floatLabel="never" class="width-100 " >
<mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
<mat-option value="Oficial">
Oficial
Calendário Oficial
</mat-option>
<mat-option value="Pessoal">
Pessoal
Calendário Pessoal
</mat-option>
</mat-select>
</mat-form-field>
src/app/pages/agenda/new-event/new-event.page.html
+3 -3
View File
@@ -29,8 +29,8 @@
<mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
<mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
<div *ngIf="calendars != 'Meu calendario' "> Calendário de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> {{calendars}} </div>
<div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
</mat-option>
@@ -62,7 +62,7 @@
<mat-form-field appearance="none" class="width-100" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="postEvent.CalendarName" >
<mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
{{ calendars }}
Calendário {{ calendars }}
</mat-option>
</mat-select>
</mat-form-field>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+2 -2
View File
@@ -35,8 +35,8 @@
<mat-select [(value)]="CalendarOwnerName" (selectionChange)="changeAgenda()">
<mat-option *ngFor="let calendars of calendarService.calendarNamesAry" value="{{calendars}}">
<div *ngIf="calendars != 'Meu calendario' "> Calendário de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> {{calendars}} </div>
<div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
</mat-option>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+2 -2
View File
@@ -65,8 +65,8 @@
interface="action-sheet" Cancel-text="Cancelar"
required
>
<ion-select-option value="Oficial">Oficial</ion-select-option>
<ion-select-option value="Pessoal">Pessoal</ion-select-option>
<ion-select-option value="Oficial">Calendário Oficial</ion-select-option>
<ion-select-option value="Pessoal">Calendário Pessoal</ion-select-option>
</ion-select>
src/app/shared/agenda/event-list/event-list.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
Meu Calendário
Agenda de {{loggeduser.FullName}}
</ion-segment-button>
<ion-segment-button value="PR">
Calendário Partilhado
src/app/shared/agenda/new-event/new-event.page.html
+3 -4
View File
@@ -40,13 +40,12 @@
<mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
<mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
<div *ngIf="calendars != 'Meu calendario' "> Calendário de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> {{calendars}} </div>
<div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
</div>
@@ -76,7 +75,7 @@
<mat-select [(value)]="postEvent.CalendarName" >
<mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
{{ calendars }}
Calendário {{ calendars }}
</mat-option>
</mat-select>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+2 -2
View File
@@ -56,10 +56,10 @@
<mat-form-field appearance="none" class="width-100" >
<mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
<mat-option value="Oficial">
Oficial
Calendário Oficial
</mat-option>
<mat-option value="Pessoal">
Pessoal
Calendário Pessoal
</mat-option>
</mat-select>
</mat-form-field>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -10,7 +10,7 @@
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
Meu Calendário
Agenda de {{loggeduser.FullName}}
</ion-segment-button>
<ion-segment-button value="PR">
Calendário Partilhado
src/environments/environment.prod.ts
+1 -1
View File
@@ -1,6 +1,6 @@
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
src/environments/environment.ts
+1 -1
View File
@@ -22,7 +22,7 @@
export const environment = {
production: false,
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
apiWsChatUrl: 'ws://gd-chat.oapr.gov.ao/websocket',