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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-29 10:16:00 +01:00
parent 022bbbec38 32017af732
commit eb474ca53c
79 changed files with 905 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app-routing.module.ts
+4
View File
@@ -159,6 +159,10 @@ const routes = [
{
path: 'document-set-up-meeting',
loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule)
},
{
path: 'profile',
loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule)
},
src/app/app.module.ts
+7 -8
View File
@@ -37,21 +37,20 @@ import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-compo
import {
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
} from '@angular-material-components/datetime-picker';
import { MatDialogModule } from '@angular/material/dialog';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MatButtonModule } from '@angular/material/button';
import { ProcessesResolverService } from './resolvers/processes-resolver.service';
import { HttpClient } from '@angular/common/http';
@NgModule({
declarations: [AppComponent],
entryComponents: [],
imports: [BrowserModule,
imports: [BrowserModule,
CommonModule,
FormsModule,
CalendarModule.forRoot({
@@ -60,9 +59,9 @@ import { HttpClient } from '@angular/common/http';
}),
IonicModule.forRoot({animated: false}),
IonicStorageModule.forRoot(),
AppRoutingModule,
HttpClientModule,
// NgbModule,
AppRoutingModule,
HttpClientModule,
// NgbModule,
NoopAnimationsModule,
MatDatepickerModule,
src/app/components/components.module.ts
-12
View File
@@ -1,12 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
@NgModule({
declarations: [],
exports: [],
imports: [
CommonModule,
]
})
export class ComponentsModule { }
src/app/home/home-routing.module.ts
-1
View File
@@ -223,7 +223,6 @@ const routes: Routes = [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then(m => m.DiplomasAssinarPageModule),
/* resolve { diplomas: ProcessesResolverService}, */
},
{
path:':SerialNumber/:caller',
src/app/home/home.module.ts
-2
View File
@@ -8,7 +8,6 @@ import { HomePageRoutingModule } from './home-routing.module';
import { HomePage } from './home.page';
/* import { IonicSelectableModule } from 'ionic-selectable'; */
import { ComponentsModule } from '../components/components.module';
@NgModule({
imports: [
@@ -16,7 +15,6 @@ import { ComponentsModule } from '../components/components.module';
FormsModule,
IonicModule,
HomePageRoutingModule,
ComponentsModule
],
declarations: [HomePage],
})
src/app/home/home.page.ts
+4 -4
View File
@@ -85,8 +85,8 @@ export class HomePage implements OnInit {
if(this.platform.is('desktop') || this.platform.is('mobileweb')) {
console.log('Notifications not supported')
} else {
this.mobilefirstConnect();
this.notificatinsservice.onReceviNotification();
/* this.mobilefirstConnect();
this.notificatinsservice.onReceviNotification(); */
}
}
@@ -97,11 +97,11 @@ export class HomePage implements OnInit {
window['WLAuthorizationManager'].obtainAccessToken("").then( (token) => {
console.log('MobileFirst Server connect: Success ' + token);
var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
WLResourceRequest.GET
);
resourceRequest.setQueryParameter("name", "world");
resourceRequest.send().then(
(response) => {
src/app/modals/document-detail/document-detail.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DocumentDetailPageRoutingModule } from './document-detail-routing.modul
import { DocumentDetailPage } from './document-detail.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@NgModule({
@@ -16,7 +16,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DocumentDetailPageRoutingModule,
BtnModalDismissPageModule,
],
src/app/modals/profile/edit-profile/edit-profile-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EditProfilePage } from './edit-profile.page';
const routes: Routes = [
{
path: '',
component: EditProfilePage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EditProfilePageRoutingModule {}
src/app/modals/profile/edit-profile/edit-profile.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { EditProfilePageRoutingModule } from './edit-profile-routing.module';
import { EditProfilePage } from './edit-profile.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
EditProfilePageRoutingModule
],
declarations: [EditProfilePage]
})
export class EditProfilePageModule {}
src/app/modals/profile/edit-profile/edit-profile.page.html
+76
View File
@@ -0,0 +1,76 @@
<ion-content class=" bg-blue">
<div class="btn-close d-flex" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div>
<div class="profile-content width-100">
<div class="d-flex justify-space-between align-center">
<div class="go-back d-flex align-center" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-calendar-arrow-left.svg"></ion-icon> <div>Perfil</div>
</div>
<!-- <div class="d-flex " (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div> -->
</div>
<div >
<div class="d-flex align-center">
<ion-icon class="profile-pic" src="assets/images/icons-default-profile.svg"></ion-icon>
</div>
</div>
<div class="profile-info">
<div class="label-text">Dados Perfil</div>
<div class="user-role">{{loggeduser.RoleDescription}}</div>
<div class="email">{{loggeduser.Email}}</div>
</div>
<div class="login-preference" (mouseover)="checkState()" (click)="checkState()">
<div class="preference">Preferência Login</div>
<ion-row>
<ion-col class="align-center d-flex">
<div class="d-flex align-center" (click)="LoginPreferenceMethod('pin')">
<ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
PIN
</div>
</ion-col>
<ion-col class="align-center d-flex">
<div (click)="addFingerprint()" class="d-flex align-center">
<ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
Impressão Digital
</div>
</ion-col>
</ion-row>
</div>
<div class="d-flex justify-center mt-10">
<button (click)="addPin()" class="btn-ok buttonSize" fill="clear" color="#fff" >
<ion-label>Alterar PIN</ion-label>
</button>
</div>
</div>
</ion-content>
<ion-footer class=" footer-container ion-no-border bg-blue">
<div class="d-flex justify-space-between">
<ion-buttons slot="start" (click)="close()">
<button class="btn-cancel" fill="clear" color="#061b52" >
<ion-label>Cancelar</ion-label>
</button>
</ion-buttons>
<ion-buttons slot="end" (click)="close()">
<button class="btn-ok" fill="clear" color="#fff" >
<ion-label>Gravar</ion-label>
</button>
</ion-buttons>
</div>
</ion-footer>
src/app/modals/profile/edit-profile/edit-profile.page.scss
+73
View File
@@ -0,0 +1,73 @@
.btn-close{
padding: 20px 20px;
justify-content: center;
align-items: center;
float: right;
}
.profile-content{
width: 100% !important;
padding: 0px 20px;
float: left;
}
.icon{
font-size: 35px;
}
.go-back{
font-family: Roboto;
font-size: 25px;
.icon{
margin-right: 7px;
}
}
.profile-pic{
width: 200px;
height: 200px;
border-radius: 20px;
margin: 0px auto;
}
.profile-info{
.label-text{
font-size: 15px;
font-weight: bold;
color: white;
margin-bottom: 10px;
}
.user-role{
background-color: white;
border-radius: 5px;
padding: 12px;
font-family: Roboto;
font-size: 13px;
color: black;
text-align: center;
}
.email {
margin-top: 15px;
}
}
.login-preference{
margin-top: 44px;
.preference{
font-family: Roboto;
font-size: 15px;
margin-bottom: 20px;
font-weight: bold;
}
.checkBox{
margin-right: 10px;
}
}
.buttonSize {
width: 100% !important;
}
src/app/modals/profile/edit-profile/edit-profile.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { EditProfilePage } from './edit-profile.page';
describe('EditProfilePage', () => {
let component: EditProfilePage;
let fixture: ComponentFixture<EditProfilePage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ EditProfilePage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(EditProfilePage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/modals/profile/edit-profile/edit-profile.page.ts
+161
View File
@@ -0,0 +1,161 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AnimationController, ModalController } from '@ionic/angular';
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
import { PinPage } from 'src/app/shared/pin/pin.page';
import { LocalstoreService } from 'src/app/store/localstore.service';
@Component({
selector: 'app-edit-profile',
templateUrl: './edit-profile.page.html',
styleUrls: ['./edit-profile.page.scss'],
})
export class EditProfilePage implements OnInit {
loggeduser: User;
userLoginPreference = ''
constructor(private modalController:ModalController,
private authService: AuthService,
private animationController: AnimationController,
private router: Router,
private localstoreService: LocalstoreService
) {
this.loggeduser = authService.ValidatedUser;
console.log(this.loggeduser.RoleDescription)
this.checkState()
}
ngOnInit() {}
close() {
this.modalController.dismiss();
}
async addPin() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: PinPage,
cssClass: 'model profile-modal',
componentProps: {
}
});
modal.present();
}
async addFingerprint() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: FingerprintPage,
cssClass: 'model profile-modal',
componentProps: {
}
});
modal.present();
}
logout() {
// clear local storage
window.localStorage.clear();
setTimeout(()=>{
window.location.pathname = '/'
location.reload();
}, 1000)
}
LoginPreferenceMethod(type: string) {
let userData = this.localstoreService.get('UserData', {})
if (userData.hasOwnProperty('loginPreference')) {
if (userData.loginPreference != type) {
if (type) {
userData.loginPreference = type
}
} else {
userData.loginPreference = 'none'
}
} else {
userData.loginPreference = 'none'
}
this.localstoreService.set('UserData', userData)
}
checkState() {
let userData = this.localstoreService.get('UserData', {})
if (userData.hasOwnProperty('loginPreference')) {
this.userLoginPreference = userData.loginPreference
} else {
this.userLoginPreference = ''
}
}
}
src/app/modals/profile/profile-routing.module.ts
+21
View File
@@ -0,0 +1,21 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ProfilePage } from './profile.page';
const routes: Routes = [
{
path: '',
component: ProfilePage
},
{
path: 'edit-profile',
loadChildren: () => import('./edit-profile/edit-profile.module').then( m => m.EditProfilePageModule)
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ProfilePageRoutingModule {}
src/app/modals/profile/profile.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ProfilePageRoutingModule } from './profile-routing.module';
import { ProfilePage } from './profile.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ProfilePageRoutingModule
],
declarations: [ProfilePage]
})
export class ProfilePageModule {}
src/app/modals/profile/profile.page.html
+71
View File
@@ -0,0 +1,71 @@
<ion-content class=" bg-blue">
<div class="profile-header width-100">
<div class="div-logo">
<div class="logo height-fit-content">
<img class="img" src='assets/images/logo-no-bg.png' alt='logo'>
</div>
</div>
<div class="btn-close d-flex" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</div>
</div>
<div class="profile-content">
<div class="profile-title d-flex justify-content-center width-100">
<ion-label >{{loggeduser.RoleDescription}}</ion-label>
</div>
<div class="d-flex mt-10 width-100">
<ion-buttons slot="start" class="buttonSize" >
<button (click)="logout()" class="btn-delete" fill="clear" style="background:#ffe0e0;" >
<ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
</button>
<button (click)="editProfile()" class="btn-cancel" fill="clear" color="#fff" >
<ion-label>Editar Perfil</ion-label>
</button>
</ion-buttons>
</div>
<div class="line"></div>
</div>
<div class="notifications-content">
<ion-label>2 novas notificações</ion-label>
<ion-list>
<div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none">
<div class="item-content width-100">
<div class="notification-item">
<img class="notification-icon" slot="end" src="assets/images/icons-default-agenda.svg" >
</div>
<div class="approve-event-time">
<p>08:00</p>
<p>09:00</p>
</div>
<div class="approve-event-detail">
<p>Luanda | Palácio Presidencial</p>
<h3>Almoço de Família</h3>
</div>
<div class="notification-label"></div>
</div>
</div>
<div class="item cursor-pointer ion-no-padding ion-no-margin" lines="none">
<div class="item-content width-100">
<div class="notification-item">
<img class="notification-icon" slot="end" src="assets/images/icons-correspondencias.svg" >
</div>
<div class="approve-event-time">
<p>28-07-21</p>
<p>09:00</p>
</div>
<div class="approve-event-detail">
<h3>Relatório FMI</h3>
<p>Luanda | Palácio Presidencial</p>
</div>
</div>
</div>
</ion-list>
</div>
</ion-content>
src/app/modals/profile/profile.page.scss
+114
View File
@@ -0,0 +1,114 @@
.profile-header{
margin: 0 em(20px);
// background-color: #0782c9;
padding: 20px 20px;
border: 0!important;
overflow: auto;
.div-logo{
background: transparent;
width: calc(100% - 40px) !important;
justify-content: center;
display: flex;
float: left;
.logo{
width: 140px;
.img{
width: 100%;
margin: 0px auto;
}
}
}
}
.btn-close{
justify-content: center;
align-items: center;
float: left;
}
.profile-content{
padding: 20px 20px;
}
.icon{
font-size: 40px;
}
.profile-title{
font-weight: 300;
font-size: 20px !important;
margin-bottom: 40px !important;
}
.line{
width: 100% !important;
margin-top: 15px;
border-top: 1px solid #d8d8d8;
}
.btn-delete{
width: 40% !important;
margin-left: 0 !important;
}
.btn-cancel{
width: 40% !important;
margin-right: 0 !important;
}
.buttonSize {
width: 100% !important;
}
ion-list{
background-color: transparent !important;
}
.notifications-content{
padding: 0px 20px;
.item{
display: flex;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border: solid 1px #e9e9e9;
background-color: var(--white);
margin: 0 auto;
padding: 10px;
margin-bottom: 10px;
color: #000;
overflow: hidden;
border: 1px solid blue;
.notification-item{
width: fit-content;
float: left;
margin-right: 10px;
padding: 0 !important;
overflow: auto;
}
.notification-icon{
font-size: 35px !important;
}
.approve-event-time{
width: fit-content !important;
float: left;
}
.approve-event-detail{
width: calc(100% - 115px) !important;
float: left;
}
.notification-label{
float: right;
width: 5px;
height: 100%;
border-radius: 0% 100% 100% 0%;
background-color: #ffb703;
}
}
}
.item-inner{
padding: 0 !important;
}
src/app/modals/profile/profile.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ProfilePage } from './profile.page';
describe('ProfilePage', () => {
let component: ProfilePage;
let fixture: ComponentFixture<ProfilePage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ProfilePage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ProfilePage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/modals/profile/profile.page.ts
+103
View File
@@ -0,0 +1,103 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AnimationController, ModalController } from '@ionic/angular';
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
import { PinPage } from 'src/app/shared/pin/pin.page';
import { LocalstoreService } from 'src/app/store/localstore.service';
import { EditProfilePage } from './edit-profile/edit-profile.page';
@Component({
selector: 'app-profile',
templateUrl: './profile.page.html',
styleUrls: ['./profile.page.scss'],
})
export class ProfilePage implements OnInit {
loggeduser: User;
userLoginPreference = ''
constructor(private modalController:ModalController,
private authService: AuthService,
private animationController: AnimationController,
private router: Router,
private localstoreService: LocalstoreService
) {
this.loggeduser = authService.ValidatedUser;
console.log(this.loggeduser.RoleDescription)
this.checkState()
}
ngOnInit() {}
close() {
this.modalController.dismiss();
}
notImplemented(){}
logout() {
// clear local storage
window.localStorage.clear();
setTimeout(()=>{
window.location.pathname = '/'
location.reload();
}, 1000)
}
checkState() {
let userData = this.localstoreService.get('UserData', {})
if (userData.hasOwnProperty('loginPreference')) {
this.userLoginPreference = userData.loginPreference
} else {
this.userLoginPreference = ''
}
}
async editProfile() {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: EditProfilePage,
cssClass: 'model profile-modal',
componentProps: {
}
});
return await modal.present();
}
}
src/app/pages/agenda/agenda.module.ts
+3 -3
View File
@@ -17,7 +17,7 @@ registerLocaleData(localeDe);
import { CalendarModule, DateAdapter } from 'angular-calendar';
import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@@ -37,12 +37,12 @@ import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-t
CommonModule,
FormsModule,
IonicModule,
/* ComponentsModule, */
/* */
CalendarModule.forRoot({
provide: DateAdapter,
useFactory: adapterFactory
}),
ComponentsModule,
AgendaPageRoutingModule,
NgCalendarModule,
// entryComponents
src/app/pages/agenda/view-event/view-event.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
import { ViewEventPage } from './view-event.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ViewEventPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/chat/chat.module.ts
+2 -2
View File
@@ -17,7 +17,7 @@ import { NewGroupPage } from 'src/app/shared/chat/new-group/new-group.page';
import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.page';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { ContactsPageModule } from 'src/app/shared/chat/messages/contacts/contacts.module';
import { GroupMessagesPageModule } from 'src/app/shared/chat/group-messages/group-messages.module';
import { NewGroupPageModule } from 'src/app/shared/chat/new-group/new-group.module';
@@ -32,7 +32,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PipesModule,
ChatPageRoutingModule,
RouterModule,
src/app/pages/chat/edit-group/edit-group.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
import { EditGroupPage } from './edit-group.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EditGroupPageRoutingModule,
BtnSeguintePageModule,
],
src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
import { GroupContactsPage } from './group-contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -17,7 +17,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PipesModule,
GroupContactsPageRoutingModule,
BtnSeguintePageModule,
src/app/pages/chat/group-messages/group-messages.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { IonicModule } from '@ionic/angular';
import { GroupMessagesPageRoutingModule } from './group-messages-routing.module';
import { GroupMessagesPage } from './group-messages.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -18,7 +18,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
BrowserModule,
FormsModule,
IonicModule,
ComponentsModule,
GroupMessagesPageRoutingModule,
ChatPopoverPageModule,
BtnModalDismissPageModule,
src/app/pages/chat/group-messages/group-messages.page.html
+1 -1
View File
@@ -86,7 +86,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<button class="btn-no-color" > <!-- (click)="openChatOptions()" -->
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
src/app/pages/chat/messages/contacts/contacts.module.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { FilterPipe } from 'src/app/pipes/filter.pipe';
@NgModule({
@@ -17,7 +17,7 @@ import { FilterPipe } from 'src/app/pipes/filter.pipe';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ContactsPageRoutingModule,
PipesModule,
],
src/app/pages/chat/messages/messages.module.ts
+2 -2
View File
@@ -9,14 +9,14 @@ import { MessagesPageRoutingModule } from './messages-routing.module';
import { MessagesPage } from './messages.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
MessagesPageRoutingModule
],
declarations: [MessagesPage]
src/app/pages/chat/messages/messages.page.html
+1 -1
View File
@@ -75,7 +75,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openChatOptions()">
<button class="btn-no-color"> <!-- (click)="openChatOptions()" -->
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
src/app/pages/chat/new-group/contacts/contacts.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ContactsPageRoutingModule,
BtnSeguintePageModule,
],
src/app/pages/chat/new-group/group-chat/group-chat.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
import { GroupChatPage } from './group-chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
GroupChatPageRoutingModule,
BtnSeguintePageModule,
BtnModalDismissPageModule,
src/app/pages/chat/new-group/new-group.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module';
import { NewGroupPage } from './new-group.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
NewGroupPageRoutingModule,
BtnSeguintePageModule,
],
src/app/pages/events/events.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { EventsPageRoutingModule } from './events-routing.module';
import { EventsPage } from './events.page';
// import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-search/header-no-search.module';
@NgModule({
@@ -16,7 +16,7 @@ import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-searc
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EventsPageRoutingModule,
HeaderNoSearchPageModule,
],
src/app/pages/events/events.page.html
+9 -10
View File
@@ -25,7 +25,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<div class="conteiner-box px-20 height-100 overflow-y-auto" ng-swipe-up="swipe($event)">
@@ -36,9 +36,9 @@
<div class="text">A sua Agenda</div>
</div>
<button class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon
class="icon-next"
slot="end"
<ion-icon
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon>
</button>
@@ -46,8 +46,7 @@
<div class="content">
<ion-list>
<ion-item class="cursor-pointer" lines="none" *ngFor="let event of toDayEventStorage.eventsList"
(click)="goToEvent(event.EventId)"
>
(click)="goToEvent(event.EventId)">
<div class="d-flex content-{{loggeduser.Profile}}-{{event.CalendarName}}">
<div class="schedule-time">
@@ -64,7 +63,7 @@
</ion-item>
</ion-list>
<!--
<!--
<div class="resume">
<div class="title">
Resumo para Amnahã
@@ -75,7 +74,7 @@
-->
</div>
</div>
<div class="schedule">
<div class="schedule-header">
<div class="title">
@@ -100,10 +99,10 @@
<div class="location">{{ task.workflowInstanceDataFields.Sender }}</div>
</div>
</div>
</ion-item >
</ion-item>
</ion-list>
</div>
</div>
</div>
</ion-content>
</ion-content>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DespachoPrPageRoutingModule } from './despacho-pr-routing.module';
import { DespachoPrPage } from './despacho-pr.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
@NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DespachoPrPageRoutingModule,
HeaderPageModule,
],
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
import { DespachosPrPage } from './despachos-pr.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DespachosPrPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DespachoPageRoutingModule } from './despacho-routing.module';
import { DespachoPage } from './despacho.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
@NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DespachoPageRoutingModule,
HeaderPageModule,
],
src/app/pages/gabinete-digital/despachos/despachos.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DespachosPageRoutingModule } from './despachos-routing.module';
import { DespachosPage } from './despachos.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DespachosPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.modul
import { DiplomaAssinarPage } from './diploma-assinar.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DiplomaAssinarPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.mod
import { DiplomasAssinarPage } from './diplomas-assinar.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -19,7 +19,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
IonicModule,
DiplomasAssinarPageRoutingModule,
HeaderPageModule,
ComponentsModule,
BtnModalDismissPageModule,
],
declarations: [DiplomasAssinarPage]
src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module';
import { DiplomaPage } from './diploma.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
DiplomaPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/diplomas/diplomas.module.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { DiplomasPageRoutingModule } from './diplomas-routing.module';
import { DiplomasPage } from './diplomas.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -18,7 +18,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
IonicModule,
DiplomasPageRoutingModule,
HeaderPageModule,
ComponentsModule,
BtnModalDismissPageModule,
],
declarations: [DiplomasPage]
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ApproveEventPageRoutingModule } from './approve-event-routing.module';
import { ApproveEventPage } from './approve-event.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ApproveEventPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/event-list/event-list.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { EventListPageRoutingModule } from './event-list-routing.module';
import { EventListPage } from './event-list.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EventListPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.m
import { ExpedienteDetailPage } from './expediente-detail.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ExpedienteDetailPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/expediente/expediente.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ExpedientePageRoutingModule } from './expediente-routing.module';
import { ExpedientePage } from './expediente.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
@NgModule({
@@ -16,7 +16,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ExpedientePageRoutingModule,
HeaderPageModule,
],
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ExpedientePrPageRoutingModule } from './expediente-pr-routing.module';
import { ExpedientePrPage } from './expediente-pr.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ExpedientePrPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module'
import { ExpedientesPrPage } from './expedientes-pr.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -19,7 +19,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
IonicModule,
ExpedientesPrPageRoutingModule,
HeaderPageModule,
ComponentsModule,
BtnModalDismissPageModule,
],
declarations: [ExpedientesPrPage]
src/app/pages/gabinete-digital/gabinete-digital.module.ts
+2 -2
View File
@@ -20,7 +20,7 @@ import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/de
import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page';
import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
import { ExpedientsPageModule } from 'src/app/shared/gabinete-digital/expedients/expedients.module';
@@ -39,7 +39,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
GabineteDigitalPageRoutingModule,
//
HeaderPageModule,
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="main-content d-flex height-100 ">
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column justify-center width-md-40 flex-grow-1 ">
<div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1 ">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<div class="title-container">
<ion-label class="title">Gabinete Digital</ion-label>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+33 -10
View File
@@ -12,8 +12,8 @@ ion-content{
text-align: center;
}
.title-container{
padding: 30px 20px 0 20px !important;
margin-bottom: 15px;
padding: 30px 20px 15px 20px !important;
//margin-bottom: 15px;
.btn-no-color{
display: flex;
float: right;
@@ -81,7 +81,7 @@ ion-content{
/* NEW CSS */
.main-content {
.main-content {
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
@@ -93,8 +93,11 @@ ion-content{
border-top-left-radius: 25px;
border-top-right-radius: 25px;
.aside-wrapper{
//border: 1px solid red;
}
.aside{
//display: flex;
align-items: center;
justify-content: center;
@@ -164,7 +167,7 @@ ion-content{
}
.exp-card-title p{
text-align: center;
}
.exp-card-content{
font-size: 13px;
@@ -207,14 +210,17 @@ ion-content{
width: 547px !important;
}
}
@media only screen and (min-width: 749px) {
/* @media only screen and (min-width: 749px) {
.exp-card-long{
width: 734px !important;
}
}
} */
@media only screen and (min-width: 801px) {
@media only screen and (min-width: 701px) {
.title{
font-size: 15px !important;
}
.main-content{
.aside-wrapper{
@@ -232,7 +238,7 @@ ion-content{
}
.aside-title{
font-family: Roboto;
font-size: 25px;
font-size: 16px !important;
text-align: left;
}
.exp-card{
@@ -243,7 +249,7 @@ ion-content{
.exp-card-title{
text-align: left !important;
}
}
.exp-card-long{
//display: none;
@@ -321,6 +327,23 @@ ion-content{
}
}
}
@media only screen and (min-width: 801px) {
.title{
font-size: 25px;
}
.content{
width: 65%;
}
.aside-right{
width: 35%;
}
.aside-title{
font-family: Roboto;
font-size: 25px;
text-align: left;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { PedidoPageRoutingModule } from './pedido-routing.module';
import { PedidoPage } from './pedido.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PedidoPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/pedidos/pedidos.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { PedidosPageRoutingModule } from './pedidos-routing.module';
import { PedidosPage } from './pedidos.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PedidosPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/gabinete-digital/pendentes/pendentes.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { PendentesPageRoutingModule } from './pendentes-routing.module';
import { PendentesPage } from './pendentes.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PendentesPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
src/app/pages/publications/publications.module.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { PublicationsPageRoutingModule } from './publications-routing.module';
import { PublicationsPage } from './publications.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publications/view-publications.module';
import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module';
import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module';
@@ -20,7 +20,7 @@ import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edi
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
PublicationsPageRoutingModule,
HeaderPageModule,
ViewPublicationsPageModule,
src/app/pages/publications/view-publications/view-publications.module.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module';
import { ViewPublicationsPage } from './view-publications.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
@NgModule({
@@ -15,7 +15,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ViewPublicationsPageRoutingModule,
HeaderPageModule,
],
src/app/pages/search/search.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { SearchPageRoutingModule } from './search-routing.module';
import { SearchPage } from './search.page';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
/* */
/* import { TagCloudModule } from 'angular-tag-cloud-module'; */
@NgModule({
@@ -17,7 +17,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
FormsModule,
IonicModule,
/* TagCloudModule, */
/* ComponentsModule, */
/* */
SearchPageRoutingModule,
BtnModalDismissPageModule,
],
src/app/resolvers/pendentes-resolver.service.spec.ts
-16
View File
@@ -1,16 +0,0 @@
import { TestBed } from '@angular/core/testing';
import { PendentesResolverService } from './pendentes-resolver.service';
describe('PendentesResolverService', () => {
let service: PendentesResolverService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(PendentesResolverService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/resolvers/pendentes-resolver.service.ts
-28
View File
@@ -1,28 +0,0 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { ProcessesService } from '../services/processes.service';
@Injectable({
providedIn: 'root'
})
export class PendentesResolverService implements Resolve<any> {
constructor(
private processesService: ProcessesService,
) { }
async resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
Promise<any> {
let despachos = await this.processesService.GetTasksList("Despacho", false).toPromise();
let pareceres = await this.processesService.GetTasksList("Pedido de Parecer", false).toPromise();
let deferimentos = await this.processesService.GetTasksList("Pedido de Deferimento", false).toPromise();
let expedientes = await this.processesService.GetTasksList("Expediente", false).toPromise();
let expedientes_pr = await this.processesService.GetTasksList("Expediente do Presidente", false).toPromise();
let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).filter(data => data.workflowInstanceDataFields.Status == "Pending");
return pendentes;
}
}
src/app/resolvers/processes-resolver.service.spec.ts
-16
View File
@@ -1,16 +0,0 @@
import { TestBed } from '@angular/core/testing';
import { ProcessesResolverService } from './processes-resolver.service';
describe('ProcessesResolverService', () => {
let service: ProcessesResolverService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(ProcessesResolverService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/resolvers/processes-resolver.service.ts
-21
View File
@@ -1,21 +0,0 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { ProcessesService } from '../services/processes.service';
@Injectable({
providedIn: 'root'
})
export class ProcessesResolverService implements Resolve<any> {
constructor(
private processesService: ProcessesService,
) { }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
Observable<any> | Promise<any> | any {
/* const n: any = [{numero: '1', n2:'3e'}]
return n; */
return this.processesService.GetTasksList("Despacho do Presidente da República", false);
}
}
src/app/shared/agenda/view-event/view-event.module.ts
+1 -1
View File
@@ -9,7 +9,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
import { ViewEventPage } from './view-event.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
src/app/shared/chat/edit-group/edit-group.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module';
import { EditGroupPage } from './edit-group.page';
import { SharedModule } from '../../shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -16,7 +16,7 @@ import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EditGroupPageRoutingModule,
BtnSeguintePageModule,
],
src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts
+2 -2
View File
@@ -9,14 +9,14 @@ import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'
import { GroupContactsPage } from './group-contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
GroupContactsPageRoutingModule,
PipesModule,
],
src/app/shared/chat/group-messages/group-messages.module.ts
+2 -2
View File
@@ -8,7 +8,7 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module'
import { GroupMessagesPage } from './group-messages.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module';
@NgModule({
@@ -16,7 +16,7 @@ import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.m
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ChatPopoverPageModule,
GroupMessagesPageRoutingModule
],
src/app/shared/chat/group-messages/group-messages.page.html
+1 -2
View File
@@ -60,10 +60,9 @@
</ion-content>
<ion-footer>
<ion-label>{{message}}</ion-label>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openSendGroupMessageOptions()">
<button class="btn-no-color" > <!-- (click)="openSendGroupMessageOptions()" -->
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
src/app/shared/chat/messages/contacts/contacts.module.ts
-2
View File
@@ -9,7 +9,6 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { FilterPipe } from 'src/app/pipes/filter.pipe';
import { ComponentsModule } from 'src/app/components/components.module';
import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
@@ -17,7 +16,6 @@ import { PipesModule } from 'src/app/pipes/pipes.module';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ContactsPageRoutingModule,
PipesModule,
],
src/app/shared/chat/messages/messages.module.ts
-2
View File
@@ -8,14 +8,12 @@ import { MessagesPageRoutingModule } from './messages-routing.module';
import { MessagesPage } from './messages.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
MessagesPageRoutingModule
],
exports: [MessagesPage],
src/app/shared/chat/messages/messages.page.html
+1 -1
View File
@@ -50,7 +50,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openSendMessageOptions()">
<button class="btn-no-color" > <!-- (click)="openSendMessageOptions()" -->
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
src/app/shared/chat/new-group/contacts/contacts.module.ts
-2
View File
@@ -8,7 +8,6 @@ import { ContactsPageRoutingModule } from './contacts-routing.module';
import { ContactsPage } from './contacts.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
@NgModule({
@@ -16,7 +15,6 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ContactsPageRoutingModule,
BtnSeguintePageModule,
],
src/app/shared/chat/new-group/group-chat/group-chat.module.ts
-2
View File
@@ -8,7 +8,6 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module';
import { GroupChatPage } from './group-chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -17,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
GroupChatPageRoutingModule,
BtnSeguintePageModule,
BtnModalDismissPageModule,
src/app/shared/chat/new-group/new-group.module.ts
-2
View File
@@ -8,14 +8,12 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module';
import { NewGroupPage } from './new-group.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
NewGroupPageRoutingModule
],
exports: [NewGroupPage],
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts
-2
View File
@@ -6,7 +6,6 @@ import { IonicModule } from '@ionic/angular';
import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.module';
import { EditEventToApproveComponent } from './edit-event.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { MatNativeDateModule } from '@angular/material/core';
@@ -29,7 +28,6 @@ import { MatDialogModule } from '@angular/material/dialog';
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EditEventToApproveComponentRoutingModule,
// Angular material
MatDatepickerModule,
src/app/shared/headers/header-no-search/header-no-search.page.ts
+5 -4
View File
@@ -6,6 +6,7 @@ import { ProfileComponent } from './profile/profile.page';
import { Router } from '@angular/router';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { ProfilePage } from 'src/app/modals/profile/profile.page';
@Component({
selector: 'app-header-no-search',
templateUrl: './header-no-search.page.html',
@@ -14,12 +15,12 @@ import { User } from 'src/app/models/user.model';
export class HeaderNoSearchPage implements OnInit {
loggeduser: User;
constructor(private modalController: ModalController,
private menu: MenuController,
private animationController: AnimationController,
private router: Router,
authService: AuthService) {
authService: AuthService) {
this.loggeduser = authService.ValidatedUser;
}
@@ -51,12 +52,12 @@ export class HeaderNoSearchPage implements OnInit {
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: ProfileComponent,
component: ProfilePage,
cssClass: 'model profile-modal',
componentProps: {
}
src/app/shared/popover/chat-popover/chat-popover.module.ts
-2
View File
@@ -7,14 +7,12 @@ import { IonicModule } from '@ionic/angular';
import { ChatPopoverPageRoutingModule } from './chat-popover-routing.module';
import { ChatPopoverPage } from './chat-popover.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ChatPopoverPageRoutingModule
],
exports: [ChatPopoverPage],
src/app/shared/popover/opts-expediente/opts-expediente.module.ts
-2
View File
@@ -7,14 +7,12 @@ import { IonicModule } from '@ionic/angular';
import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module';
import { OptsExpedientePage } from './opts-expediente.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
OptsExpedientePageRoutingModule
],
declarations: [OptsExpedientePage]
src/assets/images/Gabinete Digital_files/pages-gabinete-digital-gabinete-digital-module.js.download
+3 -3
View File
@@ -86,7 +86,7 @@ __webpack_require__.r(__webpack_exports__);
/* import { ComponentsModule } from 'src/app/components/components.module'; */
/* */
let GabineteDigitalPageModule = class GabineteDigitalPageModule {
};
GabineteDigitalPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
@@ -95,7 +95,7 @@ GabineteDigitalPageModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorat
_angular_common__WEBPACK_IMPORTED_MODULE_2__["CommonModule"],
_angular_forms__WEBPACK_IMPORTED_MODULE_3__["FormsModule"],
_ionic_angular__WEBPACK_IMPORTED_MODULE_4__["IonicModule"],
/* ComponentsModule, */
/* */
_gabinete_digital_routing_module__WEBPACK_IMPORTED_MODULE_5__["GabineteDigitalPageRoutingModule"]
],
declarations: [_gabinete_digital_page__WEBPACK_IMPORTED_MODULE_6__["GabineteDigitalPage"]],
@@ -193,4 +193,4 @@ GabineteDigitalPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
/***/ })
}]);
//# sourceMappingURL=pages-gabinete-digital-gabinete-digital-module.js.map
//# sourceMappingURL=pages-gabinete-digital-gabinete-digital-module.js.map
src/assets/images/icons-default-profile.svg
+34
View File
@@ -0,0 +1,34 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
<defs>
<filter id="b8vhf9zcla" width="111.2%" height="106.5%" x="-5.6%" y="-3.3%" filterUnits="objectBoundingBox">
<feOffset in="SourceAlpha" result="shadowOffsetOuter1"/>
<feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="7.5"/>
<feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.490302666 0"/>
</filter>
<circle id="u6jbltuc9c" cx="60" cy="60" r="60"/>
<path id="ggtp3ri2hb" d="M25 0h350c13.807 0 25 11.193 25 25v664H0V25C0 11.193 11.193 0 25 0z"/>
</defs>
<g fill="none" fill-rule="evenodd">
<g>
<path fill="#0782C9" d="M0 75H1024V708H0z" transform="translate(-764 -120)"/>
<g fill="#0782C9">
<path d="M0 0H1024V150H0z" transform="translate(-764 -120)"/>
</g>
<g>
<g transform="translate(-764 -120) translate(624) matrix(1 0 0 -1 0 689)">
<use fill="#000" filter="url(#b8vhf9zcla)" xlink:href="#ggtp3ri2hb"/>
<use fill="#0782C9" xlink:href="#ggtp3ri2hb"/>
</g>
<g transform="translate(-764 -120) translate(624) translate(140 120)">
<rect width="120" height="120" fill="#FFF" fill-opacity=".6" rx="60"/>
<g>
<mask id="e5tuzk8b4d" fill="#fff">
<use xlink:href="#u6jbltuc9c"/>
</mask>
<path fill="#42B9FE" fill-opacity=".7" d="M60 28c15.464 0 28 13.431 28 30 0 10.406-4.945 19.574-12.454 24.955C92.175 89.521 104 106.317 104 126c0 25.405-19.7 46-44 46s-44-20.595-44-46c0-19.683 11.825-36.48 28.454-43.046C36.944 77.574 32 68.406 32 58c0-16.569 12.536-30 28-30z" mask="url(#e5tuzk8b4d)"/>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

src/theme/variables.scss
+1 -1
View File
@@ -408,10 +408,10 @@ $app-theme: mat-light-theme((
}
.approve-event-time{
width: 33px;
float: left;
}
.approve-event-time p{
width: 33px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;