peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull from developer

Browse Source
This commit is contained in:
Eudes Inácio
2022-01-10 15:48:06 +01:00
parent b53b8abcdb 1230ff784e
commit 8dbc379717
73 changed files with 1061 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/popover/chat-popover/chat-popover.page.scss
+1
View File
@@ -14,6 +14,7 @@
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
src/app/shared/popover/deploma-options/deploma-options.page.ts
+3 -2
View File
@@ -7,6 +7,7 @@ import { DeplomaService } from 'src/app/Rules/deploma.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common';
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-deploma-options',
@@ -30,7 +31,7 @@ export class DeplomaOptionsPage implements OnInit {
private toastService: ToastService,
private router: Router,
private deplomaService: DeplomaService,
private location: Location) {
private RouteService: RouteService) {
this.serialNumber = this.navParams.get('serialNumber');
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
@@ -216,7 +217,7 @@ export class DeplomaOptionsPage implements OnInit {
}
goBack() {
this.location.back()
this.RouteService.goBack()
}
src/app/shared/popover/despachos-options/despachos-options.page.ts
+3 -2
View File
@@ -12,6 +12,7 @@ import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { Location } from '@angular/common'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-options',
@@ -33,7 +34,7 @@ export class DespachosOptionsPage implements OnInit {
private toastService: ToastService,
public p: PermissionService,
public ThemeService: ThemeService,
private location: Location,
private RouteService: RouteService,
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
@@ -316,7 +317,7 @@ export class DespachosOptionsPage implements OnInit {
}
goBack() {
this.location.back();
this.RouteService.goBack();
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-despachos-pr-options',
@@ -33,7 +33,7 @@ export class DespachosPrOptionsPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
private location: Location,
private RouteService: RouteService,
public p: PermissionService,
public ThemeService: ThemeService,
@@ -373,7 +373,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
goBack() {
this.location.back();
this.RouteService.goBack();
}
cancle() {
src/app/shared/popover/messages-options/messages-options.page.html
+4 -7
View File
@@ -1,13 +1,10 @@
<ion-content class="container">
<div class="arrow-right" (click)="close()">
<button class="btn-no-color">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
<div class="arrow-right">
<button class="btn-no-color" (click)="close()">
<ion-icon src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
<div class="solid"></div>
<button hidden (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
<button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
</div>
</ion-content>
src/app/shared/popover/messages-options/messages-options.page.scss
+50 -42
View File
@@ -1,50 +1,58 @@
.container{
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.arrow-right{
display: none;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
display: none;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-around;
display: flex;
flex-wrap: wrap;
justify-content: space-around;
}
.solid {
display: none;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
/* .btn-ok, .btn-cancel, .btn-delete{
width: calc(50% - 10px) !important;
margin: 5px 5px 5px 5px !important;
} */
@media only screen and (min-width: 701px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
display: none;
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
/* .solid{
display: block;
} */
display: block;
width: 90%;
border-top: 1px solid #bbb;
margin: 10px auto !important;
}
@media only screen and (min-width: 701px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
//display: none;
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-cancel:hover, .btn-delete:hover{
background-color: var(--button-hover);
color: #fff !important;
}
.btn-ok{
width: 100% !important;
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
}
.solid{
display: block;
}
.mobile-only{
display: none !important;
}
}
src/app/shared/popover/messages-options/messages-options.page.ts
+2 -3
View File
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ChatService } from 'src/app/services/chat.service';
import { ThemeService } from 'src/app/services/theme.service'
import { ThemeService } from 'src/app/services/theme.service';
@Component({
selector: 'app-messages-options',
@@ -18,7 +17,7 @@ export class MessagesOptionsPage implements OnInit {
private modalController: ModalController,
private chatService: ChatService,
private navParams: NavParams,
public ThemeService: ThemeService
public ThemeService: ThemeService,
)
{
this.roomId = this.navParams.get('roomId');
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+3 -3
View File
@@ -14,7 +14,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente-pr',
@@ -50,7 +50,7 @@ export class OptsExpedientePrPage implements OnInit {
private navParams: NavParams,
private animationController: AnimationController,
private toastService: ToastService,
private location: Location,
private RouteService: RouteService,
public ThemeService: ThemeService
) {
@@ -329,7 +329,7 @@ export class OptsExpedientePrPage implements OnInit {
}
goBack() {
this.location.back()
this.RouteService.goBack()
}
getAttachments(serialNumber){
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { ExpedienteService } from 'src/app/Rules/expediente.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { RouteService } from 'src/app/services/route.service';
@Component({
selector: 'app-opts-expediente',
@@ -46,7 +46,7 @@ export class OptsExpedientePage implements OnInit {
private activatedRoute: ActivatedRoute,
public p: PermissionService,
private attachmentsService: AttachmentsService,
private location: Location,
private RouteService: RouteService,
private TaskService: TaskService,
private expedienteService: ExpedienteService,
public ThemeService: ThemeService
@@ -107,7 +107,7 @@ export class OptsExpedientePage implements OnInit {
}
}
else {
this.location.back()
this.RouteService.goBack()
/* this.activatedRoute.paramMap.subscribe(params => {