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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-25 12:06:18 +01:00
parent 983423b906
commit 3fbdfc1296
10 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.html
+5 -5
View File
@@ -17,7 +17,7 @@
<div class="px-20">
<div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
<ion-input placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
@@ -25,7 +25,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
</div>
@@ -36,7 +36,7 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select disabled placeholder="Selecione agenda"
<ion-select disabled placeholder="Selecione agenda*"
selectedText="{{postEvent.CalendarName}}"
[(ngModel)]="postEvent.CalendarName"
interface="action-sheet" Cancel-text="Cancelar"
@@ -54,7 +54,7 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
<ion-select placeholder="Selecione tipo de evento*"
[(ngModel)]="postEvent.Categories[0]"
selectedText="{{postEvent.Categories[0]}}"
interface="action-sheet"
@@ -116,7 +116,7 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione repetição"
<ion-select placeholder="Selecione repetição*"
[(ngModel)]="postEvent.IsRecurring"
selectedText="{{isRecurring}}"
interface="action-sheet"
src/app/pages/agenda/edit-event/edit-event.page.scss
+1 -1
View File
@@ -87,7 +87,7 @@
}
.list-people-title{
/* font-size: 13px; */
color: #797979;
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
src/app/pages/agenda/new-event/new-event.page.html
+9 -11
View File
@@ -15,7 +15,7 @@
<!-- <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
<div class="ion-item-container">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
<ion-input placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2">
@@ -23,7 +23,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -39,7 +39,7 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione agenda"
<ion-select placeholder="Selecione agenda*"
selectedText="{{postEvent.CalendarName}}"
[(ngModel)]="postEvent.CalendarName"
interface="action-sheet" Cancel-text="Cancelar"
@@ -57,7 +57,7 @@
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
<ion-select placeholder="Selecione tipo de evento*"
[(ngModel)]="postEvent.Categories[0]"
interface="action-sheet"
Cancel-text="Cancelar" required>
@@ -77,7 +77,7 @@
</div>
<div class="ion-input-class">
<ion-datetime
placeholder="Início"
placeholder="Início*"
[(ngModel)]="postEvent.StartDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
@@ -98,7 +98,7 @@
</div>
<div class="ion-input-class">
<ion-datetime
placeholder="Fim"
placeholder="Fim*"
[(ngModel)]="postEvent.EndDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
@@ -118,7 +118,7 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-select placeholder="Selecione repetição*" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-select-option value="false">Não se repete</ion-select-option>
<ion-select-option value="true">Repete</ion-select-option>
</ion-select>
@@ -135,7 +135,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar interveniente</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes*</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
@@ -153,9 +153,7 @@
</div>
</div>
<!-- HIDDEN -->
<div hidden class="container-div">
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
src/app/pages/agenda/new-event/new-event.page.scss
+1 -1
View File
@@ -104,7 +104,7 @@ ion-content{
}
.list-people-title{
/* font-size: 13px; */
color: #797979;
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
src/app/pages/agenda/view-event/view-event.page.ts
+3 -1
View File
@@ -13,6 +13,7 @@ import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedi
import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-view-event',
@@ -53,6 +54,7 @@ export class ViewEventPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private router: Router,
private toastService: ToastService,
)
{
this.isEventEdited = false;
@@ -134,7 +136,7 @@ export class ViewEventPage implements OnInit {
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.toastService.successMessage('Evento apagado');
this.close();
});
}
src/app/services/auth.service.ts
+3 -4
View File
@@ -55,12 +55,11 @@ export class AuthService {
let response: any;
try {
result = await this.http.get<boolean>(service, options).toPromise();
response = await this.http.post<User>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
console.log(response);
if (result) {
if (response) {
if( response.RoleID == 100000014) {
response.Profile = 'PR'
} else if(response.RoleID == 100000011) {
@@ -73,11 +72,11 @@ export class AuthService {
this.storageService.store(AuthConnstants.USER, response);
return result;
return true;
}
} catch (error) {
return result;
return false;
}
}
src/app/shared/agenda/edit-event/edit-event.page.html
+14 -14
View File
@@ -14,7 +14,7 @@
<ion-content>
<div class="main-content">
<div class="ion-item-container">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
<ion-input placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2 width-100 d-flex">
@@ -22,7 +22,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
<ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
@@ -41,7 +41,7 @@
<div class="ion-input-class flex-grow-1">
<mat-form-field floatLabel="never" class="width-100" >
<mat-select placeholder="Selecione agenda" [(ngModel)]="postEvent.CalendarName" >
<mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
<mat-option value="Oficial">
Oficial
</mat-option>
@@ -62,9 +62,9 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="width-100" placeholder="Sample Type" required>
<mat-form-field floatLabel="never" class="width-100" required>
<!-- <input matInput type="text" > -->
<mat-select matInput [(value)]="postEvent.Categories[0]" >
<mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories[0]" >
<mat-option value="Reunião">
Reunião
</mat-option>
@@ -91,7 +91,7 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="date-hour-picker">
<mat-form-field floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
@@ -119,7 +119,7 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="date-hour-picker">
<mat-form-field floatLabel="never" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
@@ -147,8 +147,8 @@
</div>
<div class="ion-input-class flex-grow-1">
<mat-form-field class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
<mat-select [(ngModel)]="postEvent.IsRecurring">
<mat-form-field floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*" [(ngModel)]="postEvent.IsRecurring">
<mat-option value="false">
Não se repete
</mat-option>
@@ -194,7 +194,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Como conhecido</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -255,15 +255,15 @@
<ion-footer class="ion-no-border">
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label>
</ion-button>
</button>
</ion-buttons>
<ion-title></ion-title>
<ion-buttons slot="end">
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Gravar</ion-label>
</ion-button>
</button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/shared/agenda/edit-event/edit-event.page.scss
+1 -1
View File
@@ -99,7 +99,7 @@ ion-content{
}
.list-people-title{
/* font-size: 13px; */
color: #797979;
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
src/app/shared/agenda/new-event/new-event.page.scss
-1
View File
@@ -91,7 +91,6 @@
.list-people{
width: 256px;
float: left;
color: #ebebeb;
}
.add-people{
src/app/shared/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -53,7 +53,7 @@ export class ViewEventPage implements OnInit {
private processes: ProcessesService,
private modalController: ModalController,
public popoverController: PopoverController,
private toastService: ToastService
private toastService: ToastService,
)
{
this.isEventEdited = false;