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 4b2778ded..9617957b1 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -27,7 +27,6 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
import { ThemeService } from 'src/app/services/theme.service'
import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
-
const moment = _rollupMoment || _moment;
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -111,9 +110,9 @@ export class NewEventPage implements OnInit {
public stepMinutes = [1, 5, 10, 15, 20, 25];
public stepSeconds = [1, 5, 10, 15, 20, 25];
-
showLoader = false
+ CalendarName;
constructor(
private modalController: ModalController,
@@ -136,13 +135,15 @@ export class NewEventPage implements OnInit {
ngOnInit() {
+ this.CalendarName = this.loggeduser.Profile;
+
this.getRecurrenceTypes();
if(!this.restoreTemporaryData()){
// clear
this.eventBody = { BodyType : "1", Text : ""};
this.postEvent.Body = this.eventBody;
- /* console.log(this.profile); */
+ /* console.log(this.profile); */
let selectedStartdDate = this.selectedDate;
let selectedEndDate = new Date(this.selectedDate);
@@ -404,7 +405,7 @@ export class NewEventPage implements OnInit {
});
}
- else if(this.loggeduser.Profile == 'PR') {
+ else if(this.CalendarName == 'PR') {
console.log('PR - Aqui');
console.log(this.postEvent);
this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(
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 2de4d89da..d321f7939 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -13,6 +13,7 @@ import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
+import { RouteService } from 'src/app/services/route.service';
@Component({
@@ -234,7 +235,7 @@ export class ViewEventPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(res=>{
- //this.location.back();
+ //this.RouteService.goBack();
});
}
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index 0ad15f77b..f388b9636 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -7,6 +7,7 @@ import { DeplomaService } from 'src/app/Rules/deploma.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common';
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-deploma-options',
@@ -30,7 +31,7 @@ export class DeplomaOptionsPage implements OnInit {
private toastService: ToastService,
private router: Router,
private deplomaService: DeplomaService,
- private location: Location) {
+ private RouteService: RouteService) {
this.serialNumber = this.navParams.get('serialNumber');
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -216,7 +217,7 @@ export class DeplomaOptionsPage implements OnInit {
}
goBack() {
- this.location.back()
+ this.RouteService.goBack()
}
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index b87751e16..8d3fa6e25 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -12,6 +12,7 @@ import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { Location } from '@angular/common'
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-options',
@@ -33,7 +34,7 @@ export class DespachosOptionsPage implements OnInit {
private toastService: ToastService,
public p: PermissionService,
public ThemeService: ThemeService,
- private location: Location,
+ private RouteService: RouteService,
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
@@ -316,7 +317,7 @@ export class DespachosOptionsPage implements OnInit {
}
goBack() {
- this.location.back();
+ this.RouteService.goBack();
}
}
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index 070c98772..f77c7996e 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
-
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-pr-options',
@@ -33,7 +33,7 @@ export class DespachosPrOptionsPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
- private location: Location,
+ private RouteService: RouteService,
public p: PermissionService,
public ThemeService: ThemeService,
@@ -373,7 +373,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
goBack() {
- this.location.back();
+ this.RouteService.goBack();
}
cancle() {
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 8fd55d91f..fb91e2029 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -14,7 +14,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ThemeService } from 'src/app/services/theme.service'
-
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente-pr',
@@ -50,7 +50,7 @@ export class OptsExpedientePrPage implements OnInit {
private navParams: NavParams,
private animationController: AnimationController,
private toastService: ToastService,
- private location: Location,
+ private RouteService: RouteService,
public ThemeService: ThemeService
) {
@@ -329,7 +329,7 @@ export class OptsExpedientePrPage implements OnInit {
}
goBack() {
- this.location.back()
+ this.RouteService.goBack()
}
getAttachments(serialNumber){
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index da24ec370..bf2c55c37 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -18,7 +18,7 @@ import { ExpedienteService } from 'src/app/Rules/expediente.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
-
+import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente',
@@ -46,7 +46,7 @@ export class OptsExpedientePage implements OnInit {
private activatedRoute: ActivatedRoute,
public p: PermissionService,
private attachmentsService: AttachmentsService,
- private location: Location,
+ private RouteService: RouteService,
private TaskService: TaskService,
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
@@ -107,7 +107,7 @@ export class OptsExpedientePage implements OnInit {
}
}
else {
- this.location.back()
+ this.RouteService.goBack()
/* this.activatedRoute.paramMap.subscribe(params => {
diff --git a/src/assets/images/Gabinete Digital_files/vendor.js.download b/src/assets/images/Gabinete Digital_files/vendor.js.download
index e6ddf4b47..1218a996a 100644
--- a/src/assets/images/Gabinete Digital_files/vendor.js.download
+++ b/src/assets/images/Gabinete Digital_files/vendor.js.download
@@ -105274,7 +105274,7 @@ let NavController = class NavController {
*/
back(options = { animated: true, animationDirection: 'back' }) {
this.setDirection('back', options.animated, options.animationDirection, options.animation);
- return this.location.back();
+ return this.RouteService.goBack();
}
/**
* This methods goes back in the context of Ionic's stack navigation.
diff --git a/src/assets/images/nav-hover/icons-nav-actions.svg b/src/assets/images/nav-hover/icons-nav-actions.svg
new file mode 100644
index 000000000..b3cff32ad
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-actions.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg b/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg
new file mode 100644
index 000000000..07bb69f11
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-agenda-inactive.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-calendar-active.svg b/src/assets/images/nav-hover/icons-nav-calendar-active.svg
new file mode 100644
index 000000000..09ce7870f
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-calendar-active.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-chat-active.svg b/src/assets/images/nav-hover/icons-nav-chat-active.svg
new file mode 100644
index 000000000..54f038f34
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-chat-active.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-gabinete-active.svg b/src/assets/images/nav-hover/icons-nav-gabinete-active.svg
new file mode 100644
index 000000000..09ce7870f
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-gabinete-active.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-grupos-inactive-dk-white.svg b/src/assets/images/nav-hover/icons-nav-grupos-inactive-dk-white.svg
new file mode 100644
index 000000000..54f038f34
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-grupos-inactive-dk-white.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/images/nav-hover/icons-nav-home-active.svg b/src/assets/images/nav-hover/icons-nav-home-active.svg
new file mode 100644
index 000000000..fa2b1fd71
--- /dev/null
+++ b/src/assets/images/nav-hover/icons-nav-home-active.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/js/index.js b/src/assets/js/index.js
index 40ff5e409..09bc8c224 100644
--- a/src/assets/js/index.js
+++ b/src/assets/js/index.js
@@ -1,28 +1,28 @@
-// Import the functions you need from the SDKs you need
-import { initializeApp } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-app.js";;
-import { getAnalytics } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-analytics.js";
-import { getMessaging, getToken } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-messaging.js";
+// // Import the functions you need from the SDKs you need
+// import { initializeApp } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-app.js";;
+// import { getAnalytics } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-analytics.js";
+// import { getMessaging, getToken } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-messaging.js";
-// TODO: Add SDKs for Firebase products that you want to use
-// https://firebase.google.com/docs/web/setup#available-libraries
+// // TODO: Add SDKs for Firebase products that you want to use
+// // https://firebase.google.com/docs/web/setup#available-libraries
-// Your web app's Firebase configuration
-// For Firebase JS SDK v7.20.0 and later, measurementId is optional
-const firebaseConfig = {
- apiKey: "AIzaSyAAdHmTFznCMerdT99nrewJgISRvtxPqoY",
- authDomain: "gabinete-digital-2020.firebaseapp.com",
- databaseURL: "https://gabinete-digital-2020.firebaseio.com",
- projectId: "gabinete-digital-2020",
- storageBucket: "gabinete-digital-2020.appspot.com",
- messagingSenderId: "800733765231",
- appId: "1:800733765231:web:28e7792ab150006513779a",
- measurementId: "G-8QN4BLZ8XK"
-};
+// // Your web app's Firebase configuration
+// // For Firebase JS SDK v7.20.0 and later, measurementId is optional
+// const firebaseConfig = {
+// apiKey: "AIzaSyAAdHmTFznCMerdT99nrewJgISRvtxPqoY",
+// authDomain: "gabinete-digital-2020.firebaseapp.com",
+// databaseURL: "https://gabinete-digital-2020.firebaseio.com",
+// projectId: "gabinete-digital-2020",
+// storageBucket: "gabinete-digital-2020.appspot.com",
+// messagingSenderId: "800733765231",
+// appId: "1:800733765231:web:28e7792ab150006513779a",
+// measurementId: "G-8QN4BLZ8XK"
+// };
-// Initialize Firebase
-const app = initializeApp(firebaseConfig);
-const analytics = getAnalytics(app);
-const messaging = getMessaging(app);
+// // Initialize Firebase
+// const app = initializeApp(firebaseConfig);
+// const analytics = getAnalytics(app);
+// const messaging = getMessaging(app);
-getToken({vapidKey: "BEuyzkUKcx4FSs-6GaIz_si2oV5Ut7e5ZEtcrVvr5L_tMVWZtS1NTqdtQkih5QCt2FZKuRUxZIaLm5GaxI6nJEw"});
\ No newline at end of file
+// getToken({vapidKey: "BEuyzkUKcx4FSs-6GaIz_si2oV5Ut7e5ZEtcrVvr5L_tMVWZtS1NTqdtQkih5QCt2FZKuRUxZIaLm5GaxI6nJEw"});
\ No newline at end of file
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 39a448aa0..9e3681dcb 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,6 +3,6 @@ export const environment = {
apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
domain: 'gabinetedigital.local',
- defaultuser: '',
- defaultuserpwd: ''
+ defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local
+ defaultuserpwd: '', //tabteste@006,
};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6b3c2fb1d..a7de6b222 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -15,7 +15,7 @@ export const environment = {
};
/*
- * For easier debugging in development mode, you can import the following file
+ * For easier debugging in dev elopment mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
*
* This import should be commented out in production mode because it will have a negative impact
+
+