-
- Acções Presidenciais
+
+
+ Acções Presidenciais
+
@@ -82,7 +82,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index a7709d154..8ff977153 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -113,6 +113,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
saveTask(){
+
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
attendees = attendees.map(function(val) {
return {
@@ -120,6 +121,7 @@ export class ExpedientTaskModalPage implements OnInit {
UserType: val.IsRequired?"I": "CC"
};
})
+
if(this.taskParticipants.length > 0){
switch (this.taskType){
case '0':
@@ -185,7 +187,10 @@ export class ExpedientTaskModalPage implements OnInit {
this.adding = "intervenient";
this.contacts = this.taskParticipants;
- if(window.innerWidth <=1024){
+ if(window.innerWidth <=800){
+
+ this.showAttendees=false;
+
const modal = await this.modalController.create({
component: AddParticipantsModalPage,
componentProps: {
@@ -214,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit {
console.log(this.postData);
});
} else {
-
+ this.showAttendees=true
}
}
@@ -223,7 +228,9 @@ export class ExpedientTaskModalPage implements OnInit {
this.adding = "CC";
this.contacts = this.taskParticipantsCc;
- if(window.innerWidth <=1024){
+ if(window.innerWidth <=800){
+ this.showAttendees=false;
+
const modal = await this.modalController.create({
component: AddParticipantsCcModalPage,
componentProps: {
@@ -251,6 +258,8 @@ export class ExpedientTaskModalPage implements OnInit {
this.postData.UsersSelected = this.participants;
console.log(this.postData);
});
+ } else {
+ this.showAttendees=true
}
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 0faf5dfbb..14b9fca6b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -141,7 +141,7 @@ export class ExpedienteDetailPage implements OnInit {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
- classs = 'modal'
+ classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
@@ -193,7 +193,7 @@ export class ExpedienteDetailPage implements OnInit {
async openBookMeetingModal(task: any) {
let classs;
if( window.innerWidth <= 800){
- classs = 'book-meeting-modal'
+ classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 1363d9c4d..a6f019fbc 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -65,14 +65,7 @@ export class ExpedientePage implements OnInit {
}
async viewExpedientDetail(serialNumber:any) {
- console.log(this.profile);
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal modal-desktop'
- } else {
- classs = 'gabinete-digital-mobile-modal-to-Desktop'
- }
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
@@ -80,7 +73,7 @@ export class ExpedientePage implements OnInit {
serialNumber: serialNumber,
profile: this.profile,
},
- cssClass: classs,
+ cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 14273edd9..e0357154b 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -20,7 +20,7 @@
-
+
{{count_ev_md+count_ev_pr}} Documentos
+
{{count_exp_dailywork}} Documentos
+
Pendentes
- Documentos
+
+
Pedidos de Parecer
- Documentos
+
+
Pedidos de Deferimento
- Documentos
+
+
- Documentos
+
Expediente Presidente
- Documentos
+
+
- Documentos
+
-
+
+
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 3a3b9b069..0b5a60046 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -345,3 +345,9 @@ ion-content{
width: 25%;
}
}
+
+
+.active {
+ border: 1px solid green;
+ box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index a7eacfcb0..34ad0b2c6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
templateUrl: './gabinete-digital.page.html',
styleUrls: ['./gabinete-digital.page.scss'],
})
+
export class GabineteDigitalPage implements OnInit {
segment:string;
@@ -27,11 +28,13 @@ export class GabineteDigitalPage implements OnInit {
count_ev_pr=0;
count_ev_md=0;
+ selectedElement = "";
desktopComponent: any = {
showEventList: false,
showExpediente : false
}
+
showEventsToApprove = false;
showEmptyContainer = false;
showExpedients = true;
@@ -46,17 +49,15 @@ export class GabineteDigitalPage implements OnInit {
private alertService: AlertService,
private activatedRoute: ActivatedRoute,
private router: Router,
- ) {
+ ) {
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth <= 1024){
this.modalController.dismiss();
}
- this.adjastModalHeight();
- };
- this.adjastModalHeight();
+ };
this.activatedRoute.queryParams.subscribe(params => {
if(params["show"]){
@@ -69,24 +70,6 @@ export class GabineteDigitalPage implements OnInit {
}
- adjastModalHeight(){
- setTimeout(() => {
- if( window.innerWidth <= 1366){
-
- document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
- console.log('adjast width')
- e.setAttribute('style',`height:${window.innerHeight - (74 + 57)}px`)
- })
- } else if( window.innerWidth >= 1366){
- document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
- console.log('adjast width')
- e.setAttribute('style',`height:${window.innerHeight - (74)}px`)
- })
- }
- }, 200);
-
-
- }
closeAllDesktopComponent(){
this.desktopComponent = {
@@ -94,6 +77,7 @@ export class GabineteDigitalPage implements OnInit {
showExpediente: false
}
}
+
ngOnInit() {
//Initialize profile as mdgpr
this.profile = "MDGPR";
@@ -178,22 +162,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{
async openEventsToApproveList(profile:any){
this.closeAllDesktopComponent();
-
- let classs;
- if( window.innerWidth <= 800){
- classs = 'modal'
- } else {
- classs = 'gabinete-digital-mobile-modal-to-Desktop'
- }
-
//if( window.innerWidth <= 1024){
- this.adjastModalHeight();
const modal = await this.modalController.create({
component: EventListPage,
componentProps:{
profile: profile,
},
- cssClass: classs,
+ cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
@@ -203,6 +178,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
//}
}
+
openExpedientListPage(){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
@@ -212,6 +188,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.showExpedients = true;
}
}
+
openExpedientPage(data){
console.log(data);
@@ -224,24 +201,18 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.showExpedientDetail = true;
}
}
+
async openExpedientList(){
this.closeAllDesktopComponent();
- let classs;
- if( window.innerWidth <= 1024){
- classs = 'modal'
- } else {
- classs = 'gabinete-digital-mobile-modal-to-Desktop'
- }
//if( window.innerWidth <= 1024){
- this.adjastModalHeight();
const modal = await this.modalController.create({
component: ExpedientePage,
componentProps:{
profile: this.profile,
},
- cssClass: classs,
+ cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 697c9f9e7..3e288ecf2 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -11,6 +11,7 @@ import { PhotoService } from 'src/app/services/photo.service';
import { NotificationsService } from 'src/app/services/notifications.service';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Token } from '../../models/token.model';
+import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
@@ -38,7 +39,8 @@ export class LoginPage implements OnInit {
private storageService: StorageService,
private toastService: ToastService,
private photoService: PhotoService,
- public alertController: AlertController) { }
+ public alertController: AlertController,
+ private fcm: FCM) { }
ngOnInit() {
@@ -78,40 +80,9 @@ export class LoginPage implements OnInit {
});
}
- /* storeUserIdANdToken() {
-
- (PushNotifications as any).requestPermission().then(result => {
- PushNotifications.register();
- });
-
- PushNotifications.addListener(
- 'registration',
- (token: PushNotificationToken) => {
- console.log('FIREBASE TOKEN', token.value)
- this.storageService.store(this.username, token.value);
- this.storageService.get(this.username).then(value => {
- console.log('STORAGE TOKEN', value)
- this.storageService.get(AuthConnstants.USER).then(res => {
- console.log('USERID', res);
- const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
- const body = {
- UserId: res,
- TokenId: token.value,
- Status: 1,
- Service: 1
- };
-
- this.http.post('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body, { headers }).subscribe(data => {
- console.log('TOKEN USER MIDLE', data);
- })
- });
-
- });
-
- },
- );
-
- }; */
+ getToken() {
+ this.notificatinsservice.getAndpostToken(this.username);
+ }
async Login() {
@@ -127,7 +98,7 @@ export class LoginPage implements OnInit {
}
if (await this.authService.login(this.userattempt)) {
this.loginRocketChat();
- //this.storeUserIdANdToken();
+ this.getToken();
this.router.navigate(['/home/events']);
}
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index 5a8ff7e6d..1b6d8c16a 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -1,18 +1,3 @@
-
-
-
-
+
+
Diplomas assinaldos PR
- Documentos
-
-
-
-
- 
-
-
-
-
-
diff --git a/src/app/pages/publications/new-action/new-action.page.scss b/src/app/pages/publications/new-action/new-action.page.scss
index 0afd7e02b..3235d1aa2 100644
--- a/src/app/pages/publications/new-action/new-action.page.scss
+++ b/src/app/pages/publications/new-action/new-action.page.scss
@@ -14,7 +14,6 @@ ion-toolbar{
border-width: 0 !important;
}
.div-top-header{
- width: 400px;
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
@@ -41,7 +40,6 @@ ion-toolbar{
margin-right: 10px;
}
.content-top{
- width: 344px;
background: #f3f2f2;
height: 20px;
margin: 0 auto;
@@ -60,7 +58,6 @@ ion-toolbar{
overflow: auto;
}
.title-content{
- width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -79,7 +76,6 @@ font-size: 25px;
overflow: auto;
}
.ion-item-container{
- width: 360px;
margin: 15px auto;
border: 1px solid #ebebeb;
border-radius: 5px;
@@ -92,8 +88,8 @@ font-size: 25px;
overflow: auto;
}
.ion-item-class-2{
- width: 360px;
margin: 0px auto;
+ display: flex;
}
.ion-icon-class{
width: 45px;
@@ -101,24 +97,23 @@ font-size: 25px;
float: left;
padding: 10px;
font-size: 25px;
+
}
.ion-input-class{
- width: 315px;
height: auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
padding-right: 10px;
- float: left;
+ flex: 1;
}
.ion-textarea-class{
- width: 315px;
height: auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
padding-right: 10px;
- float: left;
+ flex: 1;
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index 2afd16c36..bdb7963d1 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -1,18 +1,4 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index b4b9d9880..c4a9f8a30 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -14,7 +14,6 @@ ion-toolbar{
border-width: 0 !important;
}
.div-top-header{
- width: 400px;
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
@@ -41,7 +40,6 @@ ion-toolbar{
margin-right: 10px;
}
.content-top{
- width: 344px;
background: #f3f2f2;
height: 20px;
margin: 0 auto;
@@ -60,7 +58,6 @@ ion-toolbar{
overflow: auto;
}
.title-content{
- width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -79,7 +76,6 @@ font-size: 25px;
overflow: auto;
}
.ion-item-container{
- width: 360px;
margin: 15px auto;
border: 1px solid #ebebeb;
border-radius: 5px;
@@ -92,8 +88,8 @@ font-size: 25px;
overflow: auto;
}
.ion-item-class-2{
- width: 360px;
margin: 0px auto;
+ display: flex;
}
.ion-icon-class{
width: 45px;
@@ -109,7 +105,7 @@ font-size: 25px;
border-radius: 5px;
padding-left: 5px;
padding-right: 10px;
- float: left;
+ flex: 1;
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 502a47b0c..976e8c80d 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -81,7 +81,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = imageData;
this.capturedImageTitle = new Date().getTime() + '.jpeg';
}, (err) => {
- console.log(err);
+ /* console.log(err); */
});
}
@@ -102,7 +102,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = imageData;
this.capturedImageTitle = new Date().getTime() + '.jpeg';
}, (err) => {
- console.log(err);
+ /* console.log(err); */
});
}
@@ -139,8 +139,8 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.publication.FileBase64,
FileExtension: 'jpeg',
}
- console.log('Edit - keep image');
- console.log(this.publication);
+ /* console.log('Edit - keep image');
+ console.log(this.publication); */
this.publications.UpdatePublication(this.publication.ProcessId, this.publication);
this.close();
}
@@ -159,8 +159,8 @@ export class NewPublicationPage implements OnInit {
FileExtension: 'jpeg',
}
- console.log('Create');
- console.log(this.publication);
+ /* console.log('Create');
+ console.log(this.publication); */
this.publications.CreatePublication(this.folderId, this.publication);
this.close();
}
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html
index e937f9f16..bfc55cfb7 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.html
@@ -1,21 +1,6 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/publication-detail/publication-detail.page.scss
index dd3f55ae5..3230c6d73 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.scss
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.scss
@@ -10,7 +10,6 @@
border-width: 0 !important;
}
.div-top-header{
- width: 400px;
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
@@ -37,7 +36,6 @@
margin-right: 10px;
}
.content-top{
- width: 344px;
background: #f3f2f2;
height: 20px;
margin: 0 auto;
@@ -55,7 +53,6 @@
overflow: auto;
}
.title-content{
- width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
@@ -67,7 +64,6 @@
overflow: auto;
}
.div-title{
- width: 270px;
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
@@ -88,7 +84,6 @@
object-fit: cover;
}
.post-description{
- width: 360px;
margin: 0 auto;
margin-bottom: 35px;
}
\ No newline at end of file
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index 6e564f5d5..cb93c0fd7 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -94,7 +94,7 @@ export class PublicationDetailPage implements OnInit {
publicationType: publicationType,
publication: this.publication,
},
- cssClass: 'new-publication',
+ cssClass: 'new-publication modal modal-desktop',
backdropDismiss: false
});
await modal.present();
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index d9004521b..8517bb29c 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -16,9 +16,9 @@
-