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

Conflit solved after pull

Browse Source
This commit is contained in:
Eudes Inácio
2022-04-28 16:33:16 +01:00
parent 637ee3dc5a b2d141c709
commit 6a0bf94b16
5 changed files with 655 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
-1
View File
@@ -302,7 +302,6 @@ export class AgendaPage implements OnInit {
eventClicked(event: CalendarEvent): void { eventClicked(event: CalendarEvent): void {
//clear //clear
this.setIntervenient([]); this.setIntervenient([]);
this.setIntervenientCC([]); this.setIntervenientCC([]);
this.clearPostEvent(); this.clearPostEvent();
src/app/pages/gabinete-digital/gabinete-digital.page.html
+50 -9
View File
@@ -35,7 +35,8 @@
<!-- This is the list view --> <!-- This is the list view -->
<div *ngSwitchCase="'listview'"> <div *ngSwitchCase="'listview'">
<ion-item-sliding>
<ion-item-sliding *ngIf="loadCount">
<div class="listview" > <div class="listview" >
<ion-list *ngIf="allProcessesList"> <ion-list *ngIf="allProcessesList">
<div <div
@@ -87,6 +88,46 @@
</ion-list> </ion-list>
</div> </div>
</ion-item-sliding> </ion-item-sliding>
<ion-item-sliding *ngIf="!loadCount" class="width-100">
<ion-item lines="none"
class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
<p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
<p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
</div>
</ion-item>
<ion-item lines="none"
class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
<p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
<p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
</div>
</ion-item>
<ion-item lines="none"
class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
<p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
<p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
</div>
</ion-item>
<ion-item lines="none"
class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
<p class="item-content-title my-10"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></p>
<p class="item-content-detail my-5"><ion-skeleton-text animated style="width: 100%"></ion-skeleton-text></p>
</div>
</ion-item>
</ion-item-sliding>
</div> </div>
<!-- This is the box view --> <!-- This is the box view -->
@@ -251,7 +292,7 @@
<ion-item-sliding class="width-100"> <ion-item-sliding class="width-100">
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -260,7 +301,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -269,7 +310,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -278,7 +319,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -289,7 +330,7 @@
</ion-item-sliding> </ion-item-sliding>
<ion-item-sliding class="width-100"> <ion-item-sliding class="width-100">
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -298,7 +339,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -307,7 +348,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
@@ -316,7 +357,7 @@
</div> </div>
</ion-item> </ion-item>
<ion-item lines="none" <ion-item lines="none"
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"> class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p> <p class="item-content-date my-5"><ion-skeleton-text animated style="width: 90%"></ion-skeleton-text></p>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+53 -55
View File
@@ -1,14 +1,14 @@
ion-content{ ion-content{
/* --padding-top:15px; */ /* --padding-top:15px; */
/* --padding-end:15px; /* --padding-end:15px;
--padding-start:15px; */ --padding-start:15px; */
/* --padding-bottom:15px; */ /* --padding-bottom:15px; */
/* --background:#ecf8ff; */ /* --background:#ecf8ff; */
} }
ion-segment{ ion-segment{
overflow: auto; overflow: auto;
} }
ion-segment-button{ ion-segment-button{
margin: 0 auto !important; margin: 0 auto !important;
padding: 0 !important; padding: 0 !important;
@@ -19,8 +19,8 @@ ion-segment-button{
min-height: 25px; min-height: 25px;
min-width: 25px; min-width: 25px;
} }
:host{ :host{
// background: #0782c9; // background: #0782c9;
ion-card-title { ion-card-title {
text-align: center; text-align: center;
@@ -62,6 +62,7 @@ ion-segment-button{
border-radius: 20px; border-radius: 20px;
} }
ion-item{ ion-item{
--ion-background-color:#ffffff;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 5px; border-radius: 5px;
} }
@@ -74,13 +75,13 @@ ion-segment-button{
ion-label{ ion-label{
padding: 10px; padding: 10px;
} }
} }
.ion-item-change-color{ .ion-item-change-color{
--ion-background-color:#fff2cc !important; --ion-background-color:#fff2cc !important;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 5px; border-radius: 5px;
} }
.div-top-header{ .div-top-header{
width: 400px; width: 400px;
margin: 0 auto; margin: 0 auto;
background-color: #0782c9; background-color: #0782c9;
@@ -107,11 +108,11 @@ ion-segment-button{
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
} }
/* NEW CSS */ /* NEW CSS */
.main-content { .main-content {
width: 100%; /* 400px */ width: 100%; /* 400px */
height: 100%; height: 100%;
font-family: Roboto; font-family: Roboto;
@@ -154,8 +155,8 @@ ion-segment-button{
user-select: none; user-select: none;
background: white; background: white;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
width: 90%; width: 360px;
margin: 0px 7px; margin: 7px;
border-radius: 15px; border-radius: 15px;
padding: 7px; padding: 7px;
border:1px solid white; border:1px solid white;
@@ -224,32 +225,32 @@ ion-segment-button{
} }
} }
} }
.title-content{ .title-content{
height: auto; height: auto;
margin: 0 auto; margin: 0 auto;
overflow: hidden; overflow: hidden;
padding: 0 !important; padding: 0 !important;
background: transparent; background: transparent;
} }
.div-title{ .div-title{
padding: 0!important; padding: 0!important;
float: left; float: left;
} }
.title{ .title{
font-size: 25px; font-size: 25px;
} }
.div-icon{ .div-icon{
float: right; float: right;
font-size: 35px; font-size: 35px;
overflow: auto; overflow: auto;
} }
/* New list view CSS */ /* New list view CSS */
ion-list{ ion-list{
background: transparent; background: transparent;
} }
.item-wrapper{ .item-wrapper{
border-radius: 15px; border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border:1px solid #e9e9e9 !important; border:1px solid #e9e9e9 !important;
@@ -380,22 +381,22 @@ ion-list{
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
} }
@media only screen and (min-width: 561px) { @media only screen and (min-width: 561px) {
.exp-card-long{ .exp-card-long{
width: 547px !important; width: 547px !important;
} }
} }
/* @media only screen and (min-width: 749px) { /* @media only screen and (min-width: 749px) {
.exp-card-long{ .exp-card-long{
width: 734px !important; width: 734px !important;
} }
} */ } */
@media only screen and (min-width: 701px) { @media only screen and (min-width: 701px) {
ion-content{ ion-content{
--background: transparent; --background: transparent;
} }
@@ -512,9 +513,9 @@ ion-list{
margin-top: 0px !important; margin-top: 0px !important;
} }
} }
} }
@media only screen and (min-width: 801px) { @media only screen and (min-width: 801px) {
.title{ .title{
font-size: 25px !important; font-size: 25px !important;
} }
@@ -530,16 +531,16 @@ ion-list{
font-size: 25px; font-size: 25px;
text-align: left; text-align: left;
} }
} }
@media only screen and (min-width: 1024px){ @media only screen and (min-width: 1024px){
.content{ .content{
width: 70%; width: 70%;
} }
.aside-right{ .aside-right{
width: 30%; width: 30%;
} }
} }
@media only screen and (min-width: 1140px) { @media only screen and (min-width: 1140px) {
.div-icon{ .div-icon{
display: none; display: none;
} }
@@ -550,10 +551,10 @@ ion-list{
.aside-right{ .aside-right{
width: 25%; width: 25%;
} }
} }
.active { .active {
color: white !important; color: white !important;
fill: white !important; fill: white !important;
border: var(--gabinete-active-hove-box-border) !important; border: var(--gabinete-active-hove-box-border) !important;
@@ -583,31 +584,28 @@ ion-list{
fill: rgb(255, 255, 255) !important fill: rgb(255, 255, 255) !important
} }
} }
} }
.active ion-icon::part(button) { .active ion-icon::part(button) {
color: white !important; color: white !important;
fill: rgb(255, 255, 255) !important; fill: rgb(255, 255, 255) !important;
} }
.active ion-icon::part(native) { .active ion-icon::part(native) {
color: white !important; color: white !important;
fill: rgb(255, 255, 255) !important; fill: rgb(255, 255, 255) !important;
} }
.active ion-icon{ .active ion-icon{
color: white !important; color: white !important;
fill: red !important; fill: red !important;
} }
ion-item.item {
background-color: white !important;
}
.item{ .item-skeleton{
width: 100% !important; width: 100% !important;
padding: 0px 20px 0 20px !important; padding: 0px 20px 0 20px !important;
border-bottom: 1px solid #ebebeb !important; border-bottom: 1px solid #ebebeb;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
flex-direction: row; flex-direction: row;
src/environments/environment.prod.ts
+1 -1
View File
@@ -1,7 +1,7 @@
export const environment = { export const environment = {
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-fo-dev.dyndns.info/GabineteDigital.Services/V5/api/', apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
//apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
//apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
//apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', //apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
src/setupProxy.js
-1
View File
@@ -6,7 +6,6 @@ module.exports = function (app) {
target: "http://gpr-dev-10.gabinetedigital.local:9080", target: "http://gpr-dev-10.gabinetedigital.local:9080",
changeOrigin: true, changeOrigin: true,
pathRewrite: function (path, req) { pathRewrite: function (path, req) {
console.log("Rewrite in /mfp/api/imfpush/: ", path);
return path.replace("/mfp/api", ""); return path.replace("/mfp/api", "");
}, },
}) })