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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-10 15:38:08 +01:00
parent 941447a479
commit fa788c425d
13 changed files with 156 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+2 -2
View File
@@ -79,11 +79,11 @@ const routes: Routes = [
},
{
path:':eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'eventId/:caller',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'edit-event',
src/app/pages/agenda/edit-event/edit-event.page.html
+4 -4
View File
@@ -136,7 +136,7 @@
<div class="container-div width-100">
<div class="ion-item-class-2">
<div (click)="addParticipants()" class="ion-item-class-2 cursor-pointer">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
@@ -149,7 +149,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipants();showAttendees=true">
<div class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
@@ -157,7 +157,7 @@
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
<div (click)="addParticipantsCC()" class="ion-item-class-2 cursor-pointer">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
@@ -170,7 +170,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipantsCC();showAttendees=true">
<div class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/edit-event/edit-event.page.ts
+29 -24
View File
@@ -93,6 +93,9 @@ export class EditEventPage implements OnInit {
this.modalController.dismiss();
}
}
if(window.innerWidth > 800){
this.showAttendees=true;
}
}
@@ -128,33 +131,36 @@ export class EditEventPage implements OnInit {
}
async openAttendees() {
if(window.innerWidth > 801){
this.showAttendees=true;
}
else{
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
});
await modal.present();
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
});
modal.onDidDismiss().then((data) => {
if(data){
data = data['data'];
await modal.present();
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
modal.onDidDismiss().then((data) => {
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
@@ -170,7 +176,6 @@ export class EditEventPage implements OnInit {
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
src/app/pages/agenda/view-event/view-event.module.ts
+5 -1
View File
@@ -9,6 +9,8 @@ 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';
@NgModule({
imports: [
@@ -16,7 +18,9 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
ViewEventPageRoutingModule
ViewEventPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
],
declarations: [ViewEventPage]
})
src/app/pages/agenda/view-event/view-event.page.html
+6 -33
View File
@@ -1,33 +1,6 @@
<!-- <ion-menu autoHide="false" side="end" content-id="main-content" >
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0')">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1')">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2')">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal()">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div> -->
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="height-100">
<div class="main-content d-flex height-100">
@@ -42,7 +15,7 @@
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div>
<div class="div-icon d-flex align-base">
<div class="menu-options d-flex align-base">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button>
@@ -84,8 +57,8 @@
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
</ion-item>
<div class="line"></div>
</div>
<div class="line"></div>
</div>
<div *ngIf="loadedAttachments" class="bottom-content width-100">
@@ -114,7 +87,7 @@
</div>
</div>
<div class="aside-right flex-column height-100 d-none d-md-flex">
<div class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="editEvent()" full class="btn-ok" shape="round" >Editar</button>
<div class="solid"></div>
src/app/pages/agenda/view-event/view-event.page.scss
+49 -6
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
ion-content{
--background:transparent;
/* --padding-top:0px;
@@ -41,15 +42,15 @@ ion-menu{
font-size: 45px;
float: right;
}
.div-icon{
.menu-options{
float: right;
padding: 1px;
}
.div-icon .edit{
.menu-options .edit{
font-size: 35px;
float: left;
}
.div-icon .delete{
.menu-options .delete{
padding: 7px;
font-size: 21px;
color:#fff;
@@ -66,8 +67,9 @@ ion-menu{
}
.main-content{
font-family: Roboto;
margin: 0 auto;
background-color: #fff;
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
overflow:auto;
.content{
@@ -234,4 +236,45 @@ ion-menu{
textarea{
border:none;
--background:#fff !important;
}
}
@media only screen and (max-width: 800px) {
.content{
width: 100% !important;
}
.aside-right{
display: none;
}
}
@media only screen and (min-width: 801px) {
.menu-options{
display: none !important;
}
.content{
width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 35%;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
}
.aside-right{
width: 25%;
}
}
src/app/pages/agenda/view-event/view-event.page.ts
+17 -8
View File
@@ -12,6 +12,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-view-event',
@@ -43,21 +44,25 @@ export class ViewEventPage implements OnInit {
constructor(
private modalController: ModalController,
private navParams: NavParams,
/* private navParams: NavParams, */
private eventsService: EventsService,
private attachmentsService: AttachmentsService,
public alertController: AlertController,
private iab: InAppBrowser,
private processes: ProcessesService,
public popoverController: PopoverController
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
)
{
this.profile = this.navParams.get('profile');
this.isEventEdited = false;
this.loadedEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
this.loadedEvent.Body = this.eventBody;
this.eventId = this.navParams.get('eventId');
/* this.eventId = this.navParams.get('eventId'); */
this.activatedRoute.paramMap.subscribe(paramMap =>{
this.eventId = paramMap['params'].eventId;
});
}
@@ -111,10 +116,14 @@ export class ViewEventPage implements OnInit {
}
getAttachments(){
this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
try {
this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
} catch (error) {
}
}
async editEventDetail() {
src/app/pages/events/events.page.ts
+10 -11
View File
@@ -272,6 +272,16 @@ export class EventsPage implements OnInit {
});
}
goToEvent(eventId:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"eventId": eventId,
"caller": "agenda"
}
};
this.router.navigate(['/home/agenda', eventId, 'events']);
}
async viewEventDetail(eventId:any) {
let classs;
if( window.innerWidth <= 800){
@@ -284,7 +294,6 @@ export class EventsPage implements OnInit {
component: ViewEventPage,
componentProps:{
eventId: eventId,
profile: this.profile,
},
cssClass: classs,
});
@@ -325,16 +334,6 @@ export class EventsPage implements OnInit {
});
}
goToEvent(eventId:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"eventId": eventId,
"caller": "agenda"
}
};
this.router.navigate(['/home/events', eventId, 'events']);
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
src/app/pages/search/search.module.ts
+3 -1
View File
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
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'; */
@@ -17,7 +18,8 @@ import { SearchPage } from './search.page';
IonicModule,
/* TagCloudModule, */
/* ComponentsModule, */
SearchPageRoutingModule
SearchPageRoutingModule,
BtnModalDismissPageModule,
],
declarations: [SearchPage],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
src/app/pages/search/search.page.html
+8 -3
View File
@@ -2,8 +2,7 @@
<!-- HEADER-->
<ion-header class="ion-no-border header-main d-md-flex flex-md-row-reverse">
<ion-progress-bar type="indeterminate" class="loader" *ngIf="showLoader"></ion-progress-bar>
<div class="d-flex ion-justify-content-between">
<div class="top-box d-flex ion-justify-content-between">
<ion-form [class.d-none]="!showSearchInput">
<div class="d-flex search-input-container ion-justify-content-between" >
<div class="icon">
@@ -33,7 +32,13 @@
<div class="profile">
<ion-icon class="icon" src="assets/images/icons-profile.svg"></ion-icon>
</div>
</div>
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<ion-icon class="icon" src="assets/images/icons-search-close.svg"></ion-icon>
</button>
</div>
</div>
<!-- Search drop down -->
<div class="advance-search pa-0 pt-10 flex-md-grow-1" *ngIf="showAdvanceSearch">
src/app/pages/search/search.page.scss
+21
View File
@@ -1,3 +1,9 @@
.top-box{
display: flex;
align-content: center;
align-items: center;
justify-content: center;
}
.header-main{
padding: 5px 18px;
padding-bottom: 2px;
@@ -6,6 +12,21 @@
width: 100%;
padding-right: 10px;
}
.btn-modal-dismiss{
width: 50px !important;
padding: 0 !important;
margin: 0 !important;
margin-left: 25px !important;
border: 1px solid red;
btn-modal-dismiss icon{
font-size: 45px !important;
}
}
.ion-align-content-center{
align-content: center;
}
.search-input-container{
background-color: white;
border-radius: 27.5px;
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="left">
<div class="btn-modal-dismiss">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.scss
+1 -1
View File
@@ -1,4 +1,4 @@
.left{
.btn-modal-dismiss{
width: 37px;
float: left;
font-size: 35px;