+
-
+
+ {
- user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
+ //user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password);
+ user.BasicAuthKey = 'Basic ' + btoa(user.username + ':' + user.password); //conversão em base64 das credenciais inseridas
const options = { headers: {'Authorization': user.BasicAuthKey }};
@@ -55,12 +56,11 @@ export class AuthService {
let response: any;
try {
- result = await this.http.get(service, options).toPromise();
response = await this.http.post(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 +73,11 @@ export class AuthService {
this.storageService.store(AuthConnstants.USER, response);
- return result;
+ return true;
}
} catch (error) {
- return result;
+ return false;
}
}
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 52cc00153..a17062b26 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -90,11 +90,6 @@ export class EventsService {
this.headers = new HttpHeaders();
this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey);
-
-
-
-
-
}
/* getAllEvents(startdate:string, enddate:string): Observable{
@@ -118,15 +113,6 @@ export class EventsService {
params = params.set("Start", startdate);
params = params.set("End", enddate);
-
- /* switch (this.loggeduser.Profile == 'MDGPR') {
- case value:
-
- break;
-
- default:
- break;
- } */
let options = {
headers: this.headersPrOficial,
@@ -306,6 +292,14 @@ export class EventsService {
return this.http.put(`${puturl}`, event, options)
}
+ changeAgenda(body:any){
+ const puturl = environment.apiURL + 'Calendar/MoveEvent';
+ let options = {
+ headers: this.headers,
+ };
+ return this.http.post(`${puturl}`, body, options);
+ }
+
/* postEvent(event:Event, calendarName:string, sharedagenda:string)
{
const puturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'PostEvent');
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 2ebe8ead3..0d792ce3e 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -14,7 +14,7 @@
@@ -40,8 +40,8 @@
+ Digite o PIN
- Digite o novo PIN
+ Digite o PIN
+ Digite o novo PIN
-
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 93e5cb06f..88f9eae74 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -211,8 +211,9 @@ ion-item{
}
}
-@media only screen and (min-width: 1024px){
- .form{
- width: 400px;
+@media only screen and (max-height: 746px){
+ .msg-bottom-p {
+ padding-top: 20px;
+ position: unset !important;
}
}
\ No newline at end of file
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 922b85145..7fd25e3ea 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -41,7 +41,8 @@ export class AuthService {
async login(user: UserForm): Promise
-
-
- 
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- 1
2
3
+
+
+
+
+
-
-
-
4
5
6
+
+
+
-
-
+
+
+ 1
2
3
+
+
+
+ 4
5
6
+
+
+
+ 7
8
9
+
+
+
0
+
-
-
- 7
8
9
+
+
+ Entrar com senha
-
-
-
-
- 0
-
- Entrar com senha
-
-
- Limpar
-
+
+ Limpar
+
+
-
@@ -22,7 +22,7 @@
-
-
-
+
+
Oficial
@@ -62,9 +62,9 @@
-
+
-
+
Reunião
@@ -91,7 +91,7 @@
-
+
-
+
-
-
+
+
Não se repete
@@ -194,7 +194,7 @@
- Como conhecido
+ Com conhecimento
{{participant.Name}}
@@ -255,15 +255,15 @@
-
+
+
-
+
+
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss
index f9eea71be..285021125 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.scss
+++ b/src/app/shared/agenda/edit-event/edit-event.page.scss
@@ -99,7 +99,7 @@ ion-content{
}
.list-people-title{
/* font-size: 13px; */
- color: #797979;
+ color: #a3a3a3;
}
.attach-document{
font-size: 15px;
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index bb5c06663..82437eff7 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -25,6 +25,7 @@ export class EditEventPage implements OnInit {
isRecurring:string;
isEventEdited: boolean;
loadedEvent: Event;
+ initCalendarName: string;
eventBody: EventBody;
segment:string = "true";
eventAttendees: EventPerson[];
@@ -95,6 +96,7 @@ export class EditEventPage implements OnInit {
}
ngOnInit() {
+
if(!this.restoreTemporaryData()){
// clear
@@ -156,19 +158,16 @@ export class EditEventPage implements OnInit {
this.showLoader = true
await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
- this.showLoader = false
-
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento actualizado',
- buttons: ['OK']
- });
-
+ if(this.initCalendarName != this.postEvent.CalendarName){
+ let body = {
+ "EventId": this.postEvent.EventId,
+ "CalendarDestinationName": this.postEvent.CalendarName,
+ }
+ console.log(body);
+ await this.eventsService.changeAgenda(body).toPromise();
+ }
+ this.showLoader = false;
this.toastService.successMessage()
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
-
},
error => {
this.showLoader = false
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index e587c2e11..d095b64d7 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -14,20 +14,44 @@
-
-
+
+
+
+
+
+
-
+
+
-
+
+
+
@@ -36,7 +60,7 @@
-
+
Oficial
@@ -58,9 +82,9 @@
-
+
-
+
Reunião
@@ -84,7 +108,11 @@
-
+
+
+
-
+
+
-
-
+
+
Não se repete
@@ -169,7 +200,7 @@
- Adicionar intervenientes
+ Adicionar intervenientes*
{{participant.Name}}
diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss
index ff29b50a3..f7dbbd685 100644
--- a/src/app/shared/agenda/new-event/new-event.page.scss
+++ b/src/app/shared/agenda/new-event/new-event.page.scss
@@ -102,7 +102,7 @@
}
.list-people-title{
/* font-size: 13px; */
- color: #797979;
+ color: #a3a3a3;
}
.attach-document{
font-size: 15px;
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 9bac41b00..a3bf1ec21 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -61,8 +61,8 @@ export class NewEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
- public minDate: any;
- public maxDate: any;
+ public minDate = new Date();
+ public maxDate = '';
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
@@ -71,7 +71,7 @@ export class NewEventPage implements OnInit {
@Input() profile:string;
@Input() selectedSegment: string;
@Input() selectedDate: Date;
- @Input() taskParticipants: EventPerson[];
+ @Input() taskParticipants: EventPerson[] = [];
@Input() taskParticipantsCc: any = [];
@Output() setIntervenient = new EventEmitter();
@@ -94,6 +94,9 @@ export class NewEventPage implements OnInit {
@ViewChild('inicio') inicio: any;
@ViewChild('picker1') picker1: any;
+ Form: any = {}
+ validateFrom = false
+
public options = [
{ value: true, label: 'True' },
@@ -118,7 +121,6 @@ export class NewEventPage implements OnInit {
return this.dateControlEnd.value
}
-
constructor(
private modalController: ModalController,
private eventService: EventsService,
@@ -154,7 +156,7 @@ export class NewEventPage implements OnInit {
let selectedEndDate = new Date(this.selectedDate);
/* Set + 30minutes to seleted datetime */
selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ;
- this.minDate = this.selectedDate.toString();
+
if(this.selectedSegment != "Combinada"){
this.postEvent ={
@@ -222,6 +224,46 @@ export class NewEventPage implements OnInit {
this.date = new Date(2021,9,4,5,6,7);
this.getDatepickerData()
+
+ this.injectValidation()
+ }
+
+ runValidation() {
+ this.validateFrom = true
+ }
+
+ injectValidation() {
+
+ this.Form = new FormGroup({
+ Subject: new FormControl(this.postEvent.Subject, [
+ Validators.required,
+ Validators.minLength(4)
+ ]),
+ Location: new FormControl(this.postEvent.Location, [
+ Validators.required,
+ ]),
+ CalendarName: new FormControl(this.postEvent.CalendarName),
+ Categories: new FormControl(this.postEvent.Categories[0], [
+ Validators.required
+ ]),
+ dateStart: new FormControl(this.dateStart, [
+ Validators.required
+ ]),
+ dateEnd: new FormControl(this.dateEnd, [
+ Validators.required
+ ]),
+ IsRecurring: new FormControl(this.postEvent.IsRecurring, [
+ Validators.required
+ ]),
+ participantes: new FormControl(this.participantes, [
+ Validators.required
+ ]),
+
+ })
+ }
+
+ get participantes() {
+ return this.taskParticipantsCc.concat(this.taskParticipants)
}
openInicio() {
@@ -283,7 +325,12 @@ export class NewEventPage implements OnInit {
}
- async save(){
+ async save() {
+
+ this.runValidation()
+
+ // dont runt this function
+ // if (!this.Form.valid) return false
this.getDatepickerData()
@@ -297,7 +344,10 @@ export class NewEventPage implements OnInit {
// console.log('MD - Aqui');
// console.log(this.postEvent);
- this.showLoader = true
+ this.showLoader = true;
+
+ console.log(this.postEvent);
+
this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(
async (id) => {
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 976e12850..55d094139 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -12,6 +12,7 @@ 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';
@Component({
selector: 'app-view-event',
@@ -51,7 +52,8 @@ export class ViewEventPage implements OnInit {
private iab: InAppBrowser,
private processes: ProcessesService,
private modalController: ModalController,
- public popoverController: PopoverController
+ public popoverController: PopoverController,
+ private toastService: ToastService,
)
{
this.isEventEdited = false;
@@ -102,15 +104,7 @@ export class ViewEventPage implements OnInit {
deleteEvent(){
this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () =>
{
- const alert = await this.alertController.create({
- cssClass: 'my-custom-class',
- header: 'Evento removido',
- buttons: ['OK']
- });
-
- setTimeout(()=>{
- alert.dismiss();
- }, 1500);
+ this.toastService.successMessage('Evento apagado');
this.close();
});
}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 56dd370c9..649c7d666 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -19,15 +19,6 @@
-
-
-
-
-
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 3b001438e..0a61077ed 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -31,10 +31,9 @@ constructor(
}
ngOnInit() {
- this.LoadList();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- this.doRefresh();
+ this.LoadList();
}
});
}
@@ -57,9 +56,12 @@ constructor(
}
async LoadList(){
+ this.diplomasList = new Array();
+
+ console.log('OOOKAY');
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
- this.diplomasList = new Array();
+
console.log(diplomas);
switch (this.segment) {
@@ -168,16 +170,12 @@ constructor(
});
});
this.showLoader = false;
-
break;
}
}
doRefresh() {
this.LoadList();
- setTimeout(() => {
- //event.target.complete();
- }, 2000);
}
}
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index b1e04b630..a3a2551a3 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -16,7 +16,7 @@
@@ -41,7 +41,7 @@
-
@@ -24,7 +24,7 @@
-
-
-
-
+
+
Oficial
@@ -194,7 +194,7 @@
- Adicionar intervenientes
+ Adicionar intervenientes*
{{participant.Name}}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index d410ad4a4..b2d2f646f 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -18,7 +18,7 @@
-
+
-
+
@@ -64,7 +64,7 @@
-
+
{
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
@@ -150,7 +151,8 @@ export class DeplomaOptionsPage implements OnInit {
goBack() {
- this.close()
+ this.close();
+ this.router.navigate(['/home/gabinete-digital/diplomas']);
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b01cd1341..2b6b37e91 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -8,9 +8,9 @@ export const environment = {
/* 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',
- defaultuser: 'paulo.pinto',
- defaultuserpwd: 'tabteste@006'
+ domain: 'gabinetedigital.local', //gabinetedigital.local
+ defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
+ defaultuserpwd: 'tabteste@006' //tabteste@006
};
/*
diff --git a/src/global.scss b/src/global.scss
index e1ea0092f..d13cdf552 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -950,14 +950,14 @@ background: rgb(92, 92, 92);
}
.mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline {
- display: none;
+ // display: none;
}
.date-hour-picker {
margin-top: -6px;
label#mat-form-field-label-7 {
- // display: none;
+ display: none;
}
.span.ng-tns-c193-4, .ng-star-inserted {
@@ -983,4 +983,16 @@ background: rgb(92, 92, 92);
// .ng-star-inserted {
// opacity: 0;
-// }
\ No newline at end of file
+// }
+
+
+
+.input-error{
+ border: 1px solid #fba0a0 !important;
+}
+
+.input-errror-message{
+ margin-top: -16px;
+ margin-bottom: 10px;
+ font-size: 11pt;
+}
\ No newline at end of file