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/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,