peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

responsive

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-06 12:18:15 +01:00
parent 89e11c6fe4
commit 3df11142f6
53 changed files with 695 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/domain/process/DispatchDomain.ts
+1 -1
View File
@@ -23,7 +23,7 @@ export class DispatchDomain {
* @activityInstanceName 'Concluir Despacho' * @activityInstanceName 'Concluir Despacho'
* @param note * @param note
* @param documents * @param documents
* @param serialNumber * @param serialNumber
* @returns * @returns
*/ */
@prohibited({userRoleId:[], permission:[]}) @prohibited({userRoleId:[], permission:[]})
src/app/home/home.page.html
+16 -18
View File
@@ -5,41 +5,39 @@
<ion-header class="ion-no-border "> <ion-header class="ion-no-border ">
<app-header ></app-header> <app-header ></app-header>
</ion-header> </ion-header>
<ion-tab-bar *ngIf="p.userPermissionCount([permissionList.Agenda.access, permissionList.Gabinete.access, permissionList.Actions.access, permissionList.Chat.access]) >= 2 || (p.userPermission([permissionList.Agenda.access]) && SessionStore.user.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
<ion-tab-bar class="dnone" *ngIf="p.userPermissionCount([permissionList.Agenda.access, permissionList.Gabinete.access, permissionList.Actions.access, permissionList.Chat.access]) >= 2 || (p.userPermission([permissionList.Agenda.access]) && SessionStore.user.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
<ion-tab-button *ngIf="SessionStore.user.OwnerCalendars.length >= 1 || p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/events')" tab="events" [class.active]="ActiveTabService.pages.home"> <ion-tab-button *ngIf="SessionStore.user.OwnerCalendars.length >= 1 || p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/events')" tab="events" [class.active]="ActiveTabService.pages.home">
<!-- <ion-icon name="home"></ion-icon> --> <!-- <ion-icon name="home"></ion-icon> -->
<ion-icon *ngIf="!ActiveTabService.pages.home" class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon> <ion-icon *ngIf="!ActiveTabService.pages.home" class="font-30-em" src="assets/images/icons-nav-home.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.home" class="nav-icon" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon> <ion-icon *ngIf="ActiveTabService.pages.home" class="font-30-em" src="assets/images/nav-hover/icons-nav-home-active.svg"></ion-icon>
<ion-label>Início</ion-label> <ion-label class="font-12-em">Início</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access])" (click)="goto('/home/agenda')" tab="agenda" [class.active]="ActiveTabService.pages.agenda"> <ion-tab-button *ngIf="p.userPermission([permissionList.Agenda.access])" (click)="goto('/home/agenda')" tab="agenda" [class.active]="ActiveTabService.pages.agenda">
<!-- <ion-icon name="calendar"></ion-icon> --> <!-- <ion-icon name="calendar"></ion-icon> -->
<ion-icon *ngIf="!ActiveTabService.pages.agenda" class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon> <ion-icon *ngIf="!ActiveTabService.pages.agenda" class="nav-icon font-30-em" src="assets/images/icons-nav-calendar.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.agenda" class="nav-icon" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon> <ion-icon *ngIf="ActiveTabService.pages.agenda" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-agenda-active.svg"></ion-icon>
<ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label> <ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Agenda</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" [class.active]="ActiveTabService.pages.gabinete"> <ion-tab-button *ngIf="p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/gabinete-digital')" [class.active]="ActiveTabService.pages.gabinete">
<!-- <ion-icon name="file-tray-stacked"></ion-icon> --> <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
<ion-icon *ngIf="!ActiveTabService.pages.gabinete" class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon> <ion-icon *ngIf="!ActiveTabService.pages.gabinete" class="nav-icon font-30-em" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.gabinete" class="nav-icon" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon> <ion-icon *ngIf="ActiveTabService.pages.gabinete" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-gabinete-active.svg"></ion-icon>
<ion-label>Gabinete</ion-label> <ion-label class="font-12-em">Gabinete</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="p.userPermission([permissionList.Actions.access])" tab="publications" [class.active]="ActiveTabService.pages.publication"> <ion-tab-button *ngIf="p.userPermission([permissionList.Actions.access])" tab="publications" [class.active]="ActiveTabService.pages.publication">
<ion-icon *ngIf="!ActiveTabService.pages.publication" class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon> <ion-icon *ngIf="!ActiveTabService.pages.publication" class="nav-icon font-30-em" src="assets/images/icons-nav-actions.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.publication" class="nav-icon" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon> <ion-icon *ngIf="ActiveTabService.pages.publication" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-actions-active.svg"></ion-icon>
<ion-label style="margin-bottom: 2px;" class="overflow-visible">Acções</ion-label> <ion-label style="margin-bottom: 2px;" class="overflow-visible font-12-em">Acções</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="ActiveTabService.pages.chat"> <ion-tab-button *ngIf="p.userPermission([permissionList.Chat.access])" tab="chat" [class.active]="ActiveTabService.pages.chat">
<ion-icon *ngIf="!ActiveTabService.pages.chat" class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon> <ion-icon *ngIf="!ActiveTabService.pages.chat" class="nav-icon font-30-em" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-icon *ngIf="ActiveTabService.pages.chat" class="nav-icon" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon> <ion-icon *ngIf="ActiveTabService.pages.chat" class="nav-icon font-30-em" src="assets/images/nav-hover/icons-nav-chat-active.svg"></ion-icon>
<ion-label>Chat</ion-label> <ion-label class="font-12-em">Chat</ion-label>
</ion-tab-button> </ion-tab-button>
</ion-tab-bar> </ion-tab-bar>
src/app/home/home.page.scss
+17
View File
@@ -52,3 +52,20 @@ ion-tab-button.active{
color: #061b52; color: #061b52;
font-weight: 650; font-weight: 650;
} }
@media only screen and (min-width: 100px) {
ion-tab-button{
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
ion-tab-button{
font-size: 16px;
}
}
src/app/modals/profile/edit-profile/edit-profile.page.scss
+9 -7
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
.main-content{ .main-content{
overflow: hidden !important; overflow: hidden !important;
} }
@@ -31,7 +33,7 @@
width: 74.67%; width: 74.67%;
margin: 0 auto; margin: 0 auto;
overflow: auto; overflow: auto;
font-size: 8.5px; font-size: rem(8.5);
font-family: Bahnschrift; font-family: Bahnschrift;
.logo-description-content{ .logo-description-content{
@@ -84,7 +86,7 @@
float: left; float: left;
.profile-title{ .profile-title{
font-size: 20px; font-size: rem(20);
font-weight: 300; font-weight: 300;
margin-bottom: 20px; margin-bottom: 20px;
} }
@@ -92,7 +94,7 @@
margin-top: 20px; margin-top: 20px;
color: black; color: black;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
.user-role{ .user-role{
background-color: white; background-color: white;
@@ -117,7 +119,7 @@
height: 40px; height: 40px;
float: left; float: left;
padding: 5px; padding: 5px;
font-size: 25px; font-size: rem(25);
} }
.ion-input-class{ .ion-input-class{
width: calc(100% - 40px); width: calc(100% - 40px);
@@ -135,7 +137,7 @@
} }
.icon{ .icon{
font-size: 40px; font-size: rem(40);
} }
.profile-pic{ .profile-pic{
@@ -154,12 +156,12 @@
margin-top: 15px; margin-top: 15px;
float: left; float: left;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
font-weight: 300; font-weight: 300;
.preference{ .preference{
font-size: 20px; font-size: rem(20);
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.checkBox{ .checkBox{
src/app/modals/profile/profile.page.scss
+8 -6
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
.profile-header { .profile-header {
margin: 0 em(20px); margin: 0 em(20px);
// background-color: #0782c9; // background-color: #0782c9;
@@ -6,7 +8,7 @@
.div-logo{ .div-logo{
background: transparent; background: transparent;
width: em(140px); width: em(140);
justify-content: center; justify-content: center;
display: flex; display: flex;
color: black; color: black;
@@ -27,7 +29,7 @@
width: 74.67%; width: 74.67%;
margin: 0 auto; margin: 0 auto;
overflow: auto; overflow: auto;
font-size: 8.5px; font-size: rem(8.5);
font-family: Bahnschrift; font-family: Bahnschrift;
.logo-description-content{ .logo-description-content{
@@ -79,19 +81,19 @@
} }
.icon { .icon {
font-size: 40px; font-size: rem(40);
} }
.profile-name { .profile-name {
font-weight: 300; font-weight: 300;
font-size: 20px !important; font-size: rem(20) !important;
margin-bottom: 17px !important; margin-bottom: 17px !important;
color: var(--profile-text-color) !important; color: var(--profile-text-color) !important;
} }
.profile-title { .profile-title {
font-weight: 300; font-weight: 300;
font-size: 20px !important; font-size: rem(20) !important;
margin-bottom: 40px !important; margin-bottom: 40px !important;
color: var(--profile-text-color) !important; color: var(--profile-text-color) !important;
} }
@@ -143,7 +145,7 @@ ion-list {
overflow: auto; overflow: auto;
} }
.notification-icon { .notification-icon {
font-size: 35px !important; font-size: rem(35) !important;
} }
.approve-event-time { .approve-event-time {
width: fit-content !important; width: fit-content !important;
src/app/models/dailyworktask.model.ts
-1
View File
@@ -1,4 +1,3 @@
import * as internal from "stream";
export class DailyWorkTask { export class DailyWorkTask {
SerialNumber: string; SerialNumber: string;
src/app/pages/agenda/agenda.page.html
+6 -6
View File
@@ -18,7 +18,7 @@
<!-- Calendar is here --> <!-- Calendar is here -->
<div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'"> <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'">
<div class="calendar-container" [style.height]="calendarHeight "> <div class="calendar-container" [class]="calendarHeight">
<ion-row class="ion-justify-content-between calendar-tool-tip"> <ion-row class="ion-justify-content-between calendar-tool-tip">
<ion-row class="ion-align-items-center first-row"> <ion-row class="ion-align-items-center first-row">
@@ -178,25 +178,25 @@
<div class="calendar-title-container px-20 d-flex"> <div class="calendar-title-container px-20 d-flex">
<ion-row class="timeline-date align-center pr-10"> <ion-row class="timeline-date align-center pr-10">
<button class="no-color" *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false"> <button class="no-color" *ngIf="showCalendar" (click)="calendarHeight=['height-75'];showCalendar=false">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
</button> </button>
<button class="no-color" *ngIf="!showCalendar" (click)="calendarHeight='356px';showCalendar=true"> <button class="no-color" *ngIf="!showCalendar" (click)="calendarHeight=['height-356'];showCalendar=true">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
</button > </button >
</ion-row> </ion-row>
<div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
Todas Todas
</div> </div>
<div style="padding-right: 50px" class=" text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais Pessoais
</div> </div>
<div class=" text-black align-center cursor-pointer" (click)="changeSegment('Oficial')" [class.active]="segment == 'Oficial' "> <div class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Oficial')" [class.active]="segment == 'Oficial' ">
Oficiais Oficiais
</div> </div>
</div> </div>
src/app/pages/agenda/agenda.page.scss
+62 -32
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
.event-indicator { .event-indicator {
background: #333; background: #333;
@@ -55,12 +56,12 @@
float: left; float: left;
} }
.title { .title {
font-size: 25px; font-size: rem(25);
} }
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -145,7 +146,7 @@ input:checked + .slider:before {
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
top: 50%; top: 50%;
left: 50%; left: 50%;
font-size: 12px; font-size: rem(12);
font-family: Verdana, sans-serif; font-family: Verdana, sans-serif;
} }
@@ -224,7 +225,7 @@ label{
position: absolute; position: absolute;
color: #fff; color: #fff;
font-weight: 600; font-weight: 600;
font-size: 12px; font-size: rem(12);
pointer-events: none; pointer-events: none;
} }
.onbtn{ .onbtn{
@@ -245,7 +246,7 @@ td.monthview-primary-with-event {
} }
.header-title{ .header-title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: rem(25);
margin: 0 5px 0 25px; margin: 0 5px 0 25px;
padding: 0; padding: 0;
/* color:#ffffff; */ /* color:#ffffff; */
@@ -260,7 +261,7 @@ td.monthview-primary-with-event {
border: 0!important; border: 0!important;
.div-search{ .div-search{
font-size: 45px; font-size: rem(45);
float: left; float: left;
margin: 0 0 0 10px margin: 0 0 0 10px
} }
@@ -274,7 +275,7 @@ td.monthview-primary-with-event {
width: 100%; width: 100%;
} }
.div-profile{ .div-profile{
font-size: 45px; font-size: rem(45);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
@@ -295,7 +296,7 @@ td.monthview-primary-with-event {
} }
div ion-raw > ul > li{ div ion-raw > ul > li{
font-size: 11pt; font-size: rem(15);
font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
} }
@@ -311,10 +312,10 @@ td.monthview-primary-with-event {
.calendar-tool-tip{ .calendar-tool-tip{
ion-icon{ ion-icon{
font-size: 30px; font-size: rem(30);
} }
.arrow-down{ .arrow-down{
font-size: 28px; font-size: rem(28);
} }
} }
@@ -370,7 +371,7 @@ td.monthview-primary-with-event {
.capitaliseText{ .capitaliseText{
font-size: 20px; font-size: rem(20);
} }
@@ -389,7 +390,7 @@ td.monthview-primary-with-event {
justify-content: space-around; justify-content: space-around;
th { th {
font-family: Roboto; font-family: Roboto;
font-size: 15px; font-size: rem(15);
color: rgba(52, 72, 94, 0.54); color: rgba(52, 72, 94, 0.54);
font-weight: normal; font-weight: normal;
} }
@@ -402,20 +403,20 @@ td.monthview-primary-with-event {
cursor: pointer; cursor: pointer;
padding: 10px 20px; padding: 10px 20px;
.collaps{ .collaps{
font-size: 20px; font-size: rem(20);
padding-right: 8px; padding-right: 8px;
} }
.filter{ .filter{
font-size: 15px; font-size: rem(15);
font-weight: normal; font-weight: normal;
ion-icon{ ion-icon{
font-size: 35px; font-size: rem(35);
color: var(--title-text-color); color: var(--title-text-color);
} }
.filter-name{ .filter-name{
color: var(--title-text-color); color: var(--title-text-color);
font-family: Roboto; font-family: Roboto;
font-size: 15px; font-size: rem(15);
margin-right: 25px; margin-right: 25px;
width: 55px; width: 55px;
} }
@@ -434,7 +435,7 @@ td.monthview-primary-with-event {
z-index: 1000000; z-index: 1000000;
li{ li{
padding: 5px 10px; padding: 5px 10px;
font-size: 15px; font-size: rem(15);
font-weight: normal; font-weight: normal;
} }
li.active{ li.active{
@@ -450,7 +451,7 @@ td.monthview-primary-with-event {
} }
.timeline-date{ .timeline-date{
font-size: 13px; font-size: rem(13);
font-weight: 500; font-weight: 500;
color: gray; color: gray;
} }
@@ -471,7 +472,7 @@ td.monthview-primary-with-event {
.day { .day {
font-weight: 500; font-weight: 500;
color: gray !important; color: gray !important;
font-size: 13px; font-size: rem(13);
} }
.EventListBoxBorder{ .EventListBoxBorder{
padding-bottom: 5px; padding-bottom: 5px;
@@ -491,19 +492,19 @@ td.monthview-primary-with-event {
.time-start{ .time-start{
color: #797979 !important; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
} }
.time-end{ .time-end{
color: #797979 !important; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
} }
} }
.schedule-date{ .schedule-date{
margin-right: 10px; margin-right: 10px;
width: 22%; width: 22%;
color: #797979 !important; color: #797979 !important;
font-size: 13px; font-size: rem(13);
} }
.schedule-details{ .schedule-details{
display: flex; display: flex;
@@ -516,12 +517,12 @@ td.monthview-primary-with-event {
width: 100%; width: 100%;
font-family: Roboto; font-family: Roboto;
color: black; color: black;
font-size: 14px; font-size: rem(14);
} }
.calendar-owner { .calendar-owner {
font-size: 14px; font-size: rem(14);
} }
.description{ .description{
@@ -535,7 +536,7 @@ td.monthview-primary-with-event {
white-space: nowrap; white-space: nowrap;
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
font-size: 17px; font-size: rem(17);
} }
} }
@@ -560,7 +561,7 @@ td.monthview-primary-with-event {
padding: 0 0 0 12px; padding: 0 0 0 12px;
} }
.div-content-Oficial h3, .div-content-Pessoal h3{ .div-content-Oficial h3, .div-content-Pessoal h3{
font-size: 14pt; font-size: rem(19);
/* border: 1px solid red; */ /* border: 1px solid red; */
} }
.div-content-Oficial p, .div-content-Pessoal p{ .div-content-Oficial p, .div-content-Pessoal p{
@@ -839,7 +840,7 @@ app-approve-event{
.resize{ .resize{
font-size: 27px !important; font-size: 27px !important;
ion-icon{ ion-icon{
font-size: 27px !important; font-size: rem(27) !important;
} }
} }
} }
@@ -861,7 +862,7 @@ app-approve-event{
$font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; $font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
$font-size: 11pt; $font-size: rem(15);
.changeText{ .changeText{
font-family: $font-family; font-family: $font-family;
@@ -888,9 +889,6 @@ $font-size: 11pt;
border: 1.5px solid black; border: 1.5px solid black;
color: white; color: white;
display: none; display: none;
.text{
}
} }
@@ -1004,4 +1002,36 @@ $font-size: 11pt;
ion-icon { ion-icon {
color: unset !important; color: unset !important;
} }
} }
@media only screen and (min-width: 100px) {
.calendar-title-container {
font-size: 14px;
}
.height-75 {
height: 75px;
}
.height-356 {
height: 324px;
}
}
@media only screen and (min-width: 500px) {
.calendar-title-container {
font-size: 16px;
}
.height-75 {
height: 75px;
}
.height-356 {
height: 356px;
}
}
src/app/pages/agenda/agenda.page.ts
+2 -2
View File
@@ -67,7 +67,7 @@ export class AgendaPage implements OnInit {
// calendar // calendar
showCalendar: boolean; showCalendar: boolean;
calendarHeight: string; calendarHeight = [];
// for timeline // for timeline
events: CalendarEvent[] = []; events: CalendarEvent[] = [];
@@ -222,7 +222,7 @@ export class AgendaPage implements OnInit {
} }
this.calendarHeight = "356px"; this.calendarHeight = ["height-356"];
this.showCalendar = true; this.showCalendar = true;
this.timelineDate = momentG(new Date(), 'dd MMMM yyyy'); this.timelineDate = momentG(new Date(), 'dd MMMM yyyy');
src/app/pages/agenda/edit-event/edit-event.page.html
+1 -1
View File
@@ -8,7 +8,7 @@
<ion-header> <ion-header>
<div class="title-content"> <div class="title-content">
<div class="middle"> <div class="middle">
<ion-label id="vsdfajnl" class="title">Editar Evento</ion-label> <ion-label id="vsdfajnl" class="title" style="font-size: 21.1px">Editar Evento</ion-label>
</div> </div>
</div> </div>
</ion-header> </ion-header>
src/app/pages/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="main-header"> <div class="main-header">
<div class="title-content width-100"> <div class="title-content width-100">
<div class="middle"> <div class="middle">
<ion-label class="title">Novo Evento</ion-label> <br> <ion-label class="title" style="font-size: 21.1px">Novo Evento</ion-label> <br>
<i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i> <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
</div> </div>
</div> </div>
src/app/pages/agenda/new-event/new-event.page.scss
+2
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-content{ ion-content{
--background:transparent; --background:transparent;
} }
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -17,7 +17,7 @@
</button> </button>
</div> </div>
<div class="middle"> <div class="middle">
<p class="title"><span>{{loadedEvent.Subject}}</span></p> <p class="title" style="font-size: 21.1px"><span>{{loadedEvent.Subject}}</span></p>
</div> </div>
<div class="menu-options d-flex"> <div class="menu-options d-flex">
<button class="btn-no-color" (click)="editEvent()"> <button class="btn-no-color" (click)="editEvent()">
src/app/pages/chat/chat.page.html
+20 -20
View File
@@ -4,14 +4,14 @@
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content d-flex height-100 border-t-radius"> <div class="main-content d-flex height-100 border-t-radius viewport-font-size">
<!-- Aside left --> <!-- Aside left -->
<div class="aside-wrapper d-flex flex-column flex-grow-1"> <div class="aside-wrapper d-flex flex-column flex-grow-1">
<!-- <p class="text-center mt-0 aside-title px-20">Chat</p> --> <!-- <p class="text-center mt-0 aside-title px-20">Chat</p> -->
<ion-progress-bar type="indeterminate" *ngIf="ChatSystemService.loadingWholeList"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="ChatSystemService.loadingWholeList"></ion-progress-bar>
<div class="title-content"> <div class="title-content">
<div class="div-title"> <div class="div-title">
<ion-label class="title">Chat</ion-label> <ion-label class="title font-25-em">Chat</ion-label>
</div> </div>
<div class="div-icon"> <div class="div-icon">
@@ -33,10 +33,10 @@
<ion-toolbar [class.block-button]="showNewEvent || showNewGroup || showContacts"> <ion-toolbar [class.block-button]="showNewEvent || showNewGroup || showContacts">
<ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()"> <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
<ion-segment-button value="Contactos"> <ion-segment-button value="Contactos" class="font-14-em">
Conversas Conversas
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="Grupos"> <ion-segment-button value="Grupos" class="font-14-em">
Grupos Grupos
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
@@ -64,19 +64,19 @@
<ion-label > <ion-label >
<span > <span >
<div > <div >
<div [class.bold-message]="room.messageUnread == true"> <div class="font-15-em" [class.bold-message]="room.messageUnread == true">
{{room.name}} {{room.name}}
</div> </div>
</div> </div>
</span> </span>
</ion-label> </ion-label>
</div> </div>
<div class="item-date" [class.item-date-active]="room.id == idSelected">{{room.duration}}</div> <div class="item-date font-13-em" [class.item-date-active]="room.id == idSelected">{{room.duration}}</div>
</div> </div>
<div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected"> <div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
<ion-label *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</ion-label> <p class="font-13-em" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
<ion-label *ngIf="room.otherUserType == true">está escrever...</ion-label> <p class="font-13-em" *ngIf="room.otherUserType == true">está escrever...</p>
<!-- <ion-label *ngIf="room.lastMessage.file"> <!-- <ion-label *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon> <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
</ion-label> --> </ion-label> -->
@@ -84,16 +84,16 @@
<div *ngIf="room.lastMessage.file"> <div *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img' && room.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon> <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img' && room.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<fa-icon *ngIf="room.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon> <fa-icon *ngIf="room.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span> <span class="font-13-em" *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span>
<fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon> <fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span> {{room.lastMessage.file.name || room.lastMessage.file.subject}}</span> <span class="font-13-em"> {{room.lastMessage.file.name || room.lastMessage.file.subject}}</span>
</div> </div>
<ion-label *ngIf="room.lastMessage.attachments"> <ion-label *ngIf="room.lastMessage.attachments">
<div *ngIf="room.lastMessage.attachments[0].image_url"> <div *ngIf="room.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon> <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span> Fotografia</span> <span class="font-13-em"> Fotografia</span>
</div> </div>
</ion-label> </ion-label>
@@ -106,7 +106,7 @@
<div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div> <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
<div class="item-content flex-grow-1 cursor-pointer"> <div class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time"> <div class="item-title-time">
<div class="item-title"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div> <div class="item-title font-15-em"><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></div>
<div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div> <div class="item-date"><ion-skeleton-text animated></ion-skeleton-text></div>
</div> </div>
<div class="item-description d-flex align-items-center"> <div class="item-description d-flex align-items-center">
@@ -134,26 +134,26 @@
<div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer"> <div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time"> <div class="item-title-time">
<div class="item-title" [class.item-title-active]="group.id ==idSelected"> <div class="item-title" [class.item-title-active]="group.id ==idSelected">
<ion-label [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</ion-label> <p class="font-15-em" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
</div> </div>
<div class="item-date" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration}}</div> <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration}}</div>
<div class="item-date" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime}}</div> <div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime}}</div>
</div> </div>
<div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected"> <div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected">
<div class="item-message" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div> <div class="item-message font-13-em" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div> <div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
<div class="item-files add-ellipsis" *ngIf="group.lastMessage.file"> <div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
<fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting' && group.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon> <fa-icon *ngIf="group.lastMessage.file.type != 'application/meeting' && group.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<fa-icon *ngIf="group.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon> <fa-icon *ngIf="group.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<span *ngIf="group.lastMessage.file.type == 'application/audio'" class="item-files-title"> audio </span> <span *ngIf="group.lastMessage.file.type == 'application/audio'" class="item-files-title font-13-em"> audio </span>
<fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon> <fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<span *ngIf="group.lastMessage.file.type != 'application/audio' && group.lastMessage.attachments" class="item-files-title"> {{ group.lastMessage.attachments[0].title }}</span> <span *ngIf="group.lastMessage.file.type != 'application/audio' && group.lastMessage.attachments" class="item-files-title font-13-em"> {{ group.lastMessage.attachments[0].title }}</span>
</div> </div>
<div class="item-files" *ngIf="group.attachments"> <div class="item-files" *ngIf="group.attachments">
<div *ngIf="group.value.lastMessage.attachments[0].image_url"> <div *ngIf="group.value.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon> <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<span> Fotografia</span> <span class="font-13-em"> Fotografia</span>
</div> </div>
</div> </div>
</div> </div>
src/app/pages/chat/chat.page.scss
+6 -10
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-content{ ion-content{
--background: transparent; --background: transparent;
} }
@@ -15,14 +17,11 @@ ion-content{
padding: 0!important; padding: 0!important;
float: left; float: left;
} }
.title{
font-size: 25px;
}
.div-icon{ .div-icon{
display: flex; display: flex;
width: fit-content; width: fit-content;
float: right; float: right;
font-size: 35px; font-size: em(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
justify-content: flex-end; justify-content: flex-end;
@@ -77,12 +76,12 @@ ion-content{
overflow: hidden; overflow: hidden;
.item-icon{ .item-icon{
width: 40px; width: em(40);
float: left; float: left;
.icon{ .icon{
margin-top: 10px; margin-top: 10px;
font-size: 40px; font-size: em(40);
} }
} }
.item-content{ .item-content{
@@ -98,7 +97,6 @@ ion-content{
.item-title{ .item-title{
width: calc(100% - 90px); width: calc(100% - 90px);
float: left; float: left;
font-size: 15px;
color: var(--title-text-color); color: var(--title-text-color);
} }
.item-title-active{ .item-title-active{
@@ -107,7 +105,6 @@ ion-content{
.item-date{ .item-date{
width: 90px; width: 90px;
float: right; float: right;
font-size: 13px;
color: #797979; color: #797979;
text-align: right; text-align: right;
} }
@@ -116,7 +113,6 @@ ion-content{
} }
.item-description{ .item-description{
font-size: 13px;
color: #000; color: #000;
overflow: auto; overflow: auto;
@@ -149,7 +145,7 @@ ion-content{
width: 35%; width: 35%;
border-right: 1px solid #d8d8d8; border-right: 1px solid #d8d8d8;
.aside-title{ .aside-title{
font-size: 25px; font-size: em(25);
} }
} }
/* .aside{ /* .aside{
src/app/pages/chat/edit-group/edit-group.page.scss
+10 -8
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-content{ ion-content{
--background:transparent; --background:transparent;
} }
@@ -14,7 +16,7 @@ ion-content{
border: 0!important; border: 0!important;
.div-search{ .div-search{
font-size: 45px; font-size: rem(45);
float: left; float: left;
margin: 0 0 0 10px margin: 0 0 0 10px
} }
@@ -28,7 +30,7 @@ ion-content{
width: 100%; width: 100%;
} }
.div-profile{ .div-profile{
font-size: 45px; font-size: rem(45);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
@@ -56,7 +58,7 @@ ion-content{
.left{ .left{
width: 37px; width: 37px;
float: left; float: left;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
.middle{ .middle{
@@ -68,19 +70,19 @@ ion-content{
.right{ .right{
padding: 0!important; padding: 0!important;
float: right; float: right;
font-size: 15px; font-size: rem(15);
color: #0782c9; color: #0782c9;
margin: 8px 0 0 5px; margin: 8px 0 0 5px;
} }
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -118,7 +120,7 @@ ion-content{
.item-container-no-border ion-label{ .item-container-no-border ion-label{
padding-left: 10px; padding-left: 10px;
font-size: 12px; font-size: rem(12);
color: #000; color: #000;
} }
} }
@@ -136,7 +138,7 @@ ion-content{
height: 45px; height: 45px;
float: left; float: left;
padding: 10px; padding: 10px;
font-size: 25px; font-size: rem(25);
} }
} }
.ion-input-class{ .ion-input-class{
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
+8 -6
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
.header-toolbar{ .header-toolbar{
--background:transparent; --background:transparent;
--opacity: 1; --opacity: 1;
@@ -17,7 +19,7 @@
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -34,7 +36,7 @@
.back-icon{ .back-icon{
width: 37px; width: 37px;
float: left; float: left;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
@@ -45,7 +47,7 @@
margin: 2.5px 0 0 5px; margin: 2.5px 0 0 5px;
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
} }
} }
@@ -105,7 +107,7 @@
.item-divider{ .item-divider{
background: #ebebeb; background: #ebebeb;
font-size: 15px; font-size: rem(15);
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
padding:5px 0 5px 20px; padding:5px 0 5px 20px;
@@ -136,12 +138,12 @@
margin: 0 !important; margin: 0 !important;
width: 330px; width: 330px;
padding-left: 10px; padding-left: 10px;
font-size: 15px; font-size: rem(15);
color: var(--title-text-color); color: var(--title-text-color);
float: left; float: left;
} }
.item-checkbox ion-icon, .members-checkbox ion-icon{ .item-checkbox ion-icon, .members-checkbox ion-icon{
font-size: 10px; font-size: rem(10);
float: left; float: left;
color:#99e47b; color:#99e47b;
margin-left: 10px; margin-left: 10px;
src/app/pages/chat/group-messages/group-messages.page.scss
+20 -20
View File
@@ -42,7 +42,7 @@
width: 100%; width: 100%;
padding: 0!important; padding: 0!important;
margin: 0 0 0 10px; margin: 0 0 0 10px;
font-size: 25px; font-size: rem(25);
} }
} }
.middle-container-options{ .middle-container-options{
@@ -53,18 +53,18 @@
.middle-container-options-icons{ .middle-container-options-icons{
color: #0782c9; color: #0782c9;
font-size: 23px; font-size: rem(23);
} }
} }
.right{ .right{
padding: 0!important; padding: 0!important;
float: right; float: right;
font-size: 25px; font-size: rem(25);
color: #0782c9; color: #0782c9;
} }
.header-top-btn{ .header-top-btn{
background: transparent; background: transparent;
font-size: 25px !important; font-size: rem(25) !important;
font-weight: 100 !important; font-weight: 100 !important;
/* color: #0782c9; */ /* color: #0782c9; */
color: #42b9fe; color: #42b9fe;
@@ -78,14 +78,14 @@
.header-bottom-icon{ .header-bottom-icon{
width: 30px; width: 30px;
font-size: 25px; font-size: rem(25);
float: left; float: left;
padding: 2px; padding: 2px;
} }
.header-bottom-contacts{ .header-bottom-contacts{
width: calc(100% - 40px); width: calc(100% - 40px);
font-size: 15px; font-size: rem(15);
color: #797979; color: #797979;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@@ -105,7 +105,7 @@
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -121,7 +121,7 @@
width: em(422px); width: em(422px);
background: #ebebeb; background: #ebebeb;
text-align: center; text-align: center;
font-size: 13px; font-size: rem(13);
color: #797979; color: #797979;
padding: 10px; padding: 10px;
margin: 0 auto; margin: 0 auto;
@@ -135,7 +135,7 @@
height: auto; height: auto;
background: var(--chat-alert-msg-color); background: var(--chat-alert-msg-color);
text-align: center; text-align: center;
font-size: 13px; font-size: rem(13);
color: #262420; color: #262420;
padding: 10px; padding: 10px;
margin: 10px auto; margin: 10px auto;
@@ -152,16 +152,16 @@
border-radius: 8px; border-radius: 8px;
margin: 10px auto; margin: 10px auto;
color: #797979 !important; color: #797979 !important;
font-size: 13px !important; font-size: rem(13) !important;
/* margin: 15px 0px 15px 0px; */ /* margin: 15px 0px 15px 0px; */
.info-text-leave ion-label{ .info-text-leave ion-label{
font-size: 13px !important; font-size: rem(13) !important;
line-height: 1.2rem; line-height: 1.2rem;
} }
} }
.messages{ .messages{
font-size: 13px; font-size: rem(13);
font-family: Roboto; font-family: Roboto;
overflow: auto; overflow: auto;
@@ -237,10 +237,10 @@
.info-meeting{ .info-meeting{
/* width: 322px; */ /* width: 322px; */
width: em(422px); width: em(422);
background: var(--chat-alert-msg-color); background: var(--chat-alert-msg-color);
text-align: center; text-align: center;
font-size: 13px; font-size: rem(13);
color: #262420; color: #262420;
padding: 10px; padding: 10px;
margin: 10px auto; margin: 10px auto;
@@ -249,11 +249,11 @@
border-radius: 8px; border-radius: 8px;
.info-meeting-small{ .info-meeting-small{
font-size: 10px; font-size: rem(10);
font-style: italic; font-style: italic;
} }
.info-meeting-medium{ .info-meeting-medium{
font-size: 12px; font-size: rem(12);
} }
.info-meeting-normal{ .info-meeting-normal{
color: #0782c9; color: #0782c9;
@@ -282,13 +282,13 @@
.chat-icon-options{ .chat-icon-options{
display:block !important; display:block !important;
font-size: 35px; font-size: rem(35);
float: right !important; float: right !important;
margin-top: 5px; margin-top: 5px;
} }
.chat-icon-send{ .chat-icon-send{
font-size: 45px; font-size: rem(45);
margin: 0 auto; margin: 0 auto;
margin-top: 4px; margin-top: 4px;
} }
@@ -351,7 +351,7 @@
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex; display: flex;
font-size: 12px; font-size: rem(12);
align-items: center; align-items: center;
} }
@@ -385,7 +385,7 @@
} }
.float-status-all { .float-status-all {
font-size: 10pt !important; font-size: rem(13) !important;
} }
.try { .try {
src/app/pages/chat/messages/contacts/contacts.page.scss
+7 -6
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
.header-toolbar{ .header-toolbar{
--background:transparent; --background:transparent;
@@ -18,7 +19,7 @@
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -35,7 +36,7 @@
.back-icon{ .back-icon{
width: 37px; width: 37px;
float: left; float: left;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
@@ -46,7 +47,7 @@
margin: 2.5px 0 0 5px; margin: 2.5px 0 0 5px;
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
} }
} }
@@ -89,7 +90,7 @@
.item-divider{ .item-divider{
background: #ebebeb; background: #ebebeb;
font-size: 15px; font-size: rem(15);
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
padding:5px 0 5px 20px; padding:5px 0 5px 20px;
@@ -106,13 +107,13 @@
display: block; display: block;
margin: 0 !important; margin: 0 !important;
width: 90%; width: 90%;
font-size: 15px; font-size: rem(15);
color: var(--title-text-color); color: var(--title-text-color);
float: left; float: left;
} }
.item-user .icon{ .item-user .icon{
width: 10%; width: 10%;
font-size: 10px; font-size: rem(10);
display: block; display: block;
text-align: right; text-align: right;
overflow: auto; overflow: auto;
src/app/pages/chat/messages/messages.page.scss
+47 -29
View File
@@ -1,4 +1,22 @@
@import '~src/function.scss'; @import '~src/function.scss';
@media only screen and (min-width: 100px) {
:host{
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
:host{
font-size: 16px;
}
}
.header-toolbar{ .header-toolbar{
--background:transparent; --background:transparent;
--opacity: 1; --opacity: 1;
@@ -29,7 +47,7 @@
.header-top-btn{ .header-top-btn{
background: transparent; background: transparent;
font-size: 25px !important; font-size: rem(25) !important;
font-weight: 100 !important; font-weight: 100 !important;
/* color: #0782c9; */ /* color: #0782c9; */
color: #42b9fe; color: #42b9fe;
@@ -58,13 +76,13 @@
.middle-container-options-icons{ .middle-container-options-icons{
color: #0782c9; color: #0782c9;
font-size: 23px; font-size: rem(23);
} }
} }
.right{ .right{
padding: 0!important; padding: 0!important;
float: right; float: right;
font-size: 25px; font-size: rem(25 );
color: #0782c9; color: #0782c9;
margin: 5px 0 0 0; margin: 5px 0 0 0;
} }
@@ -76,14 +94,14 @@
.header-bottom-icon{ .header-bottom-icon{
width: 30px; width: 30px;
font-size: 25px; font-size: rem(25);
float: left; float: left;
padding: 2px; padding: 2px;
} }
.header-bottom-contacts{ .header-bottom-contacts{
width: 275px; width: 275px;
font-size: 15px; font-size: rem(15) ;
color: #797979; color: #797979;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
@@ -95,7 +113,7 @@
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
white-space: nowrap; white-space: nowrap;
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
@@ -104,7 +122,7 @@
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -118,19 +136,19 @@
ion-content{ ion-content{
.welcome-text{ .welcome-text{
/* width: 322px; */ /* width: 322px; */
width: em(422px); width: rem(422);
background: #ebebeb; background: #ebebeb;
text-align: center; text-align: center;
font-size: 13px; font-size: rem(13) ;
color: #797979; color: #797979;
padding: 10px; padding: 10px;
margin: 0 auto; margin: 0 auto;
line-height: 1.2rem; line-height: 1.2rrem;
margin: 20px 39px 25px; margin: 20px 39px 25px;
border-radius: 8px; border-radius: 8px;
} }
.messages{ .messages{
font-size: 13px; font-size: rem(13) ;
font-family: Roboto; font-family: Roboto;
overflow: auto; overflow: auto;
@@ -145,10 +163,10 @@
word-wrap: break-word; word-wrap: break-word;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
.messages-list-item-wrapper{ .messages-list-itrem-wrapper{
overflow: hidden; overflow: hidden;
} }
.messages-list-item-wrapper-active{ .messages-list-itrem-wrapper-active{
background: #e6f6ff75 !important; background: #e6f6ff75 !important;
} }
@@ -190,23 +208,23 @@
.info-meeting{ .info-meeting{
/* width: 322px; */ /* width: 322px; */
width: em(422px); width: rem(422);
background: var(--chat-alert-msg-color); background: var(--chat-alert-msg-color);
text-align: center; text-align: center;
font-size: 13px; font-size: rem(13) ;
color: #262420; color: #262420;
padding: 10px; padding: 10px;
margin: 10px auto; margin: 10px auto;
line-height: 1.2rem; line-height: 1.2rrem;
/* margin: 15px 0px 15px 0px; */ /* margin: 15px 0px 15px 0px; */
border-radius: 8px; border-radius: 8px;
.info-meeting-small{ .info-meeting-small{
font-size: 10px; font-size: rem(10) ;
font-style: italic; font-style: italic;
} }
.info-meeting-medium{ .info-meeting-medium{
font-size: 12px; font-size: rem(12);
} }
.info-meeting-normal{ .info-meeting-normal{
color: #0782c9; color: #0782c9;
@@ -225,18 +243,18 @@
.container{ .container{
justify-content: center; justify-content: center;
justify-content: space-evenly; justify-content: space-evenly;
align-items: center; align-itrems: center;
} }
.chat-icon-options{ .chat-icon-options{
display:block !important; display:block !important;
font-size: 35px; font-size: rem(35);
float: right !important; float: right !important;
margin-top: 5px; margin-top: 5px;
} }
.chat-icon-send{ .chat-icon-send{
font-size: 45px; font-size: rem(45);
margin: 0 auto; margin: 0 auto;
margin-top: 4px; margin-top: 4px;
} }
@@ -246,7 +264,7 @@
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
border-radius: 25px; border-radius: 25px;
padding-left: 15px; padding-left: 15px;
align-items: center; align-itrems: center;
overflow: auto; overflow: auto;
ion-textarea{ ion-textarea{
@@ -259,7 +277,7 @@
} }
.text-color-blue{ .text-color-blue{
font-size: 15px; font-size: rem(15);
color: #0782c9; color: #0782c9;
font-weight: 500; font-weight: 500;
letter-spacing: normal; letter-spacing: normal;
@@ -309,8 +327,8 @@ display: block;
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex; display: flex;
font-size: 12px; font-size: rem(12);
align-items: center; align-itrems: center;
} }
@@ -334,14 +352,14 @@ button::-moz-focus-inner {
position: relative !important; position: relative !important;
float: right; float: right;
display: flex; display: flex;
align-items: self-end; align-itrems: self-end;
} }
.float-status-image{ .float-status-image{
position: relative !important; position: relative !important;
float: right; float: right;
display: flex; display: flex;
align-items: self-end; align-itrems: self-end;
top: -15px; top: -15px;
} }
@@ -350,11 +368,11 @@ button::-moz-focus-inner {
top: 0px !important; top: 0px !important;
float: right; float: right;
display: flex; display: flex;
align-items: self-end; align-itrems: self-end;
} }
.float-status-all { .float-status-all {
font-size: 10pt !important; font-size: rem(13) !important;
} }
.try { .try {
src/app/pages/chat/messages/messages.page.ts
+2 -15
View File
@@ -1,15 +1,12 @@
import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Route, Router } from '@angular/router' import { Router } from '@angular/router'
import { GestureController, ModalController, NavParams, PopoverController, Platform, AlertController } from '@ionic/angular'; import { GestureController, ModalController, NavParams, PopoverController, Platform, AlertController } from '@ionic/angular';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page'; import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { FileService } from 'src/app/services/functions/file.service'; import { FileService } from 'src/app/services/functions/file.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service'; import { ToastService } from 'src/app/services/toast.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page'; import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
@@ -20,22 +17,15 @@ import { ThemeService } from 'src/app/services/theme.service'
import { VoiceRecorder, RecordingData, GenericResponse } from 'capacitor-voice-recorder'; import { VoiceRecorder, RecordingData, GenericResponse } from 'capacitor-voice-recorder';
import { Haptics, ImpactStyle } from '@capacitor/haptics'; import { Haptics, ImpactStyle } from '@capacitor/haptics';
import { SqliteService } from 'src/app/services/sqlite.service';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service' import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
import { MessageService } from 'src/app/services/chat/message.service'; import { MessageService } from 'src/app/services/chat/message.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { CameraService } from 'src/app/services/camera.service';
import { element } from 'protractor';
import { FileType } from 'src/app/models/fileType'; import { FileType } from 'src/app/models/fileType';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'; import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
import { DomSanitizer } from '@angular/platform-browser'; import { DomSanitizer } from '@angular/platform-browser';
import { SessionStore } from 'src/app/store/session.service'; import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorResponse } from '@angular/common/http';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { File } from '@awesome-cordova-plugins/file/ngx'; import { File } from '@awesome-cordova-plugins/file/ngx';
import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
@@ -118,16 +108,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
private gestureController: GestureController, private gestureController: GestureController,
public ThemeService: ThemeService, public ThemeService: ThemeService,
private platform: Platform, private platform: Platform,
private sqlservice: SqliteService,
public ChatSystemService: ChatSystemService, public ChatSystemService: ChatSystemService,
private CameraService: CameraService,
private storage: Storage, private storage: Storage,
//private fileOpener: FileOpener, //private fileOpener: FileOpener,
private sanitiser: DomSanitizer, private sanitiser: DomSanitizer,
// private document: DocumentViewer // private document: DocumentViewer
private file: File, private file: File,
private fileOpener: FileOpener, private fileOpener: FileOpener,
private notificationService: NotificationsService,
private router: Router private router: Router
) { ) {
this.loggedUser = SessionStore.user.ChatData['data']; this.loggedUser = SessionStore.user.ChatData['data'];
src/app/pages/chat/new-group/contacts/contacts.page.scss
+8 -6
View File
@@ -1,4 +1,6 @@
@import '~src/function.scss';
.header-toolbar{ .header-toolbar{
--background:transparent; --background:transparent;
--opacity: 1; --opacity: 1;
@@ -18,7 +20,7 @@
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -35,7 +37,7 @@
.back-icon{ .back-icon{
width: 37px; width: 37px;
float: left; float: left;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
@@ -46,7 +48,7 @@
margin: 2.5px 0 0 5px; margin: 2.5px 0 0 5px;
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
} }
} }
@@ -87,7 +89,7 @@ ion-content{
.item-divider{ .item-divider{
background: #ebebeb; background: #ebebeb;
font-size: 15px; font-size: rem(15);
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
padding:5px 0 5px 20px; padding:5px 0 5px 20px;
@@ -112,12 +114,12 @@ ion-content{
margin: 0 !important; margin: 0 !important;
width: 330px; width: 330px;
padding-left: 10px; padding-left: 10px;
font-size: 15px; font-size: rem(15);
color: var(--title-text-color); color: var(--title-text-color);
float: left; float: left;
} }
.item-checkbox ion-icon{ .item-checkbox ion-icon{
font-size: 10px; font-size: rem(10);
float: left; float: left;
color:#99e47b; color:#99e47b;
margin-left: 10px; margin-left: 10px;
src/app/pages/chat/new-group/new-group.page.scss
+10 -8
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-content{ ion-content{
--background:transparent; --background:transparent;
} }
@@ -14,7 +16,7 @@ ion-content{
border: 0!important; border: 0!important;
.div-search{ .div-search{
font-size: 45px; font-size: rem(45);
float: left; float: left;
margin: 0 0 0 10px margin: 0 0 0 10px
} }
@@ -28,7 +30,7 @@ ion-content{
width: 100%; width: 100%;
} }
.div-profile{ .div-profile{
font-size: 45px; font-size: rem(45);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
@@ -55,7 +57,7 @@ ion-content{
.left{ .left{
width: 37px; width: 37px;
float: left; float: left;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
.middle{ .middle{
@@ -67,7 +69,7 @@ ion-content{
.btn-criar{ .btn-criar{
padding: 0!important; padding: 0!important;
float: right; float: right;
font-size: 15px; font-size: rem(15);
color: var(--font-awesome); color: var(--font-awesome);
margin: 8px 5px 0 5px; margin: 8px 5px 0 5px;
} }
@@ -81,12 +83,12 @@ ion-content{
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
.div-icon{ .div-icon{
width: 40px; width: 40px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
padding: 1px; padding: 1px;
} }
@@ -122,7 +124,7 @@ ion-content{
.item-container-no-border ion-label{ .item-container-no-border ion-label{
padding-left: 10px; padding-left: 10px;
font-size: 12px; font-size: rem(12);
color: #000; color: #000;
} }
} }
@@ -140,7 +142,7 @@ ion-content{
height: 45px; height: 45px;
float: left; float: left;
padding: 10px; padding: 10px;
font-size: 25px; font-size: rem(25);
} }
} }
.ion-input-class{ .ion-input-class{
src/app/pages/events/events.page.html
+15 -15
View File
@@ -28,22 +28,22 @@
<div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;"> <div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
<div class="px-20 pb-20 container-filters"> <div class="px-20 pb-20 container-filters">
<p class="time ion-text-left ">{{customDate}}</p> <p class="time ion-text-left font-18-em">{{customDate}}</p>
<div class="filters-box wrap d-flex float-left"> <div class="filters-box wrap d-flex float-left">
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('ForToDay')"> <div class="event-box pointer hideMobile font-14-em" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> --> <!-- <p>correspondencia com prazo para hoje</p> -->
<p>Correspondências com prazo para hoje</p> <p>Correspondências com prazo para hoje</p>
<span>{{ TaskService.deadline }}</span> <span>{{ TaskService.deadline }}</span>
</div> </div>
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('OverdueTasks')"> <div class="event-box pointer hideMobile font-14-em" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> --> <!-- <p>correspondencia em atraso</p> -->
<p>Correspondências em atraso</p> <p>Correspondências em atraso</p>
<span>{{ TaskService.overdueTasks }}</span> <span>{{ TaskService.overdueTasks }}</span>
</div> </div>
<div class="event-box pointer hideMobile" (click)="goToAllTaskFilter('unread')"> <div class="event-box pointer hideMobile font-14-em" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> --> <!-- <p>correspondencia não lidas</p> -->
<p>Correspondências não lidas</p> <p>Correspondências não lidas</p>
<span>{{ TaskService.unread }}</span> <span>{{ TaskService.unread }}</span>
@@ -52,17 +52,17 @@
<!-- ««««««««««««««««««««««««««««««««««««««««««««« --> <!-- ««««««««««««««««««««««««««««««««««««««««««««« -->
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('ForToDay')"> <div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> --> <!-- <p>correspondencia com prazo para hoje</p> -->
<p>Correspondências com prazo para hoje <b>{{ TaskService.deadline }}</b></p> <p>Correspondências com prazo para hoje <b>{{ TaskService.deadline }}</b></p>
</div> </div>
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('OverdueTasks')"> <div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> --> <!-- <p>correspondencia em atraso</p> -->
<p>Correspondências em atraso <b>{{ TaskService.overdueTasks }}</b></p> <p>Correspondências em atraso <b>{{ TaskService.overdueTasks }}</b></p>
</div> </div>
<div class="event-box pointer d-none showMobile" (click)="goToAllTaskFilter('unread')"> <div class="event-box pointer d-none showMobile font-14-em" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> --> <!-- <p>correspondencia não lidas</p> -->
<p>Correspondências não lidas <b>{{ TaskService.unread }}</b></p> <p>Correspondências não lidas <b>{{ TaskService.unread }}</b></p>
</div> </div>
@@ -83,21 +83,21 @@
<button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']"> <button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'default' " *ngIf="ThemeService.currentTheme == 'default' "
class="icon-next" class="icon-next font-35-rem"
slot="end" slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg" src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'gov' " *ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next" class="icon-next font-35-rem"
slot="end" slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg" src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'doneIt' " *ngIf="ThemeService.currentTheme == 'doneIt' "
class="icon-next" class="icon-next font-35-em"
slot="end" slot="end"
src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg" src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
@@ -202,26 +202,26 @@
<div class="schedule-header"> <div class="schedule-header">
<div class="title"> <div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon> <ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
<div class="text">A sua agenda do dia</div> <div class="font-size-20">A sua agenda do dia</div>
</div> </div>
<button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']"> <button class="transparent--background" title="Ir para a sua Agenda" [routerLink]="['/home/agenda']">
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'default' " *ngIf="ThemeService.currentTheme == 'default' "
class="icon-next" class="icon-next-color font-35-em"
slot="end" slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg" src="assets/images/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'gov' " *ngIf="ThemeService.currentTheme == 'gov' "
class="icon-next" class="icon-next-color font-35-em"
slot="end" slot="end"
src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg" src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
<ion-icon <ion-icon
*ngIf="ThemeService.currentTheme == 'doneIt' " *ngIf="ThemeService.currentTheme == 'doneIt' "
class="icon-next" class="icon-next-color font-35-em"
slot="end" slot="end"
src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg" src="assets/images/theme/doneIt/icons-arrow-circle-arrow-right.svg"
></ion-icon> ></ion-icon>
src/app/pages/events/events.page.scss
+23 -5
View File
@@ -309,7 +309,6 @@ ion-toolbar{
} }
.time{ .time{
font-family: Roboto; font-family: Roboto;
font-size: 18pt;
text-align: center; text-align: center;
color: var(--header-tab-text-white); color: var(--header-tab-text-white);
line-height: unset; line-height: unset;
@@ -386,11 +385,11 @@ ion-toolbar{
} }
.icon-next { .icon-next {
color: #e8e8e8; color: #e8e8e8;
height: 35px;
width: 35px;
font-size: 35px;
font-size: 35px; font-size: 35px;
} }
.icon-next-color {
color: #e8e8e8;
}
} }
.content{ .content{
//padding: 0px 20px 20px 20px; //padding: 0px 20px 20px 20px;
@@ -606,6 +605,8 @@ ion-title{
width: 150px; width: 150px;
height: 90px; height: 90px;
margin:5px; margin:5px;
margin-left: 0px;
margin-right: 0px;
flex-direction: column; flex-direction: column;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -616,7 +617,6 @@ ion-title{
-o-border-radius: 10px; -o-border-radius: 10px;
padding: 10px; padding: 10px;
p{ p{
font-size: 14px;
margin-bottom: 5px; margin-bottom: 5px;
line-height: 15px; line-height: 15px;
} }
@@ -678,3 +678,21 @@ ion-title{
.event-box-content { .event-box-content {
justify-content: flex-start !important; justify-content: flex-start !important;
} }
@media only screen and (min-width: 100px) {
.container-filters, .filters-box, .schedule-header, .Goto-agenda{
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
.container-filters, .filters-box, .schedule-header, .Goto-agenda {
font-size: 16px;
}
}
src/app/pages/gabinete-digital/despachos/despachos.page.scss
+17 -17
View File
@@ -20,7 +20,7 @@ ion-content, .header-2, .main-content{
.title{ .title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: rem(25);
color:#000; color:#000;
overflow: auto; overflow: auto;
@@ -34,7 +34,7 @@ ion-content, .header-2, .main-content{
} }
} }
.item-list-small{ .item-list-small{
font-size: 11px; font-size: rem(11);
overflow: hidden; overflow: hidden;
} }
.ion-item-class{ .ion-item-class{
@@ -77,12 +77,12 @@ ion-item{
.div-content-expediente h3, .div-content-pendentes h3{ .div-content-expediente h3, .div-content-pendentes h3{
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 14pt; font-size: rem(19);
width: 100%; width: 100%;
} }
.div-icon{ .div-icon{
width: 10%; width: 10%;
font-size: 20px; font-size: rem(20);
float: left; float: left;
color: #808080; color: #808080;
} }
@@ -92,7 +92,7 @@ ion-item{
} }
.div-content-expediente p, .div-content-pendentes p{ .div-content-expediente p, .div-content-pendentes p{
font-size: 14pt; font-size: rem(19);
color: rgb(94, 92, 92); color: rgb(94, 92, 92);
padding: 0; padding: 0;
margin: 0; margin: 0;
@@ -100,14 +100,14 @@ ion-item{
.span-left{ .span-left{
/* border: 1px solid red; */ /* border: 1px solid red; */
float: left; float: left;
font-size: 12px; font-size: rem(12);
padding-left: 18px; padding-left: 18px;
} }
.span-right{ .span-right{
/* border: 1px solid blue; */ /* border: 1px solid blue; */
text-align: right; text-align: right;
float: right; float: right;
font-size: 12px; font-size: rem(12);
padding-right: 18px; padding-right: 18px;
} }
@@ -131,7 +131,7 @@ ion-item{
width: 100%; width: 100%;
float: left; float: left;
font-family: Roboto; font-family: Roboto;
font-size: 12pt; font-size: rem(16);
font-weight: 700; font-weight: 700;
color: var(--title-text-color); color: var(--title-text-color);
padding-left: 3px; padding-left: 3px;
@@ -149,12 +149,12 @@ ion-item{
padding: 0 !important; padding: 0 !important;
ion-icon{ ion-icon{
font-size: 12pt; font-size: rem(16);
color: #42b9fe; color: #42b9fe;
float: left; float: left;
} }
label{ label{
font-size: 10pt; font-size: rem(13);
} }
} }
} }
@@ -163,7 +163,7 @@ ion-item{
} }
.exp-middle-detail{ .exp-middle-detail{
font-size: 12pt; font-size: rem(16);
width: 100%; width: 100%;
overflow: auto; overflow: auto;
@@ -183,7 +183,7 @@ ion-item{
.exp-date{ .exp-date{
width: auto; width: auto;
font-family: Roboto; font-family: Roboto;
font-size: 10pt; font-size: rem(13);
font-weight: normal; font-weight: normal;
font-stretch: normal; font-stretch: normal;
font-style: normal; font-style: normal;
@@ -194,7 +194,7 @@ ion-item{
} }
} }
.exp-bottom-detail{ .exp-bottom-detail{
font-size: 8pt; font-size: rem(11);
width: 100%; width: 100%;
overflow: auto; overflow: auto;
padding-left: 3px; padding-left: 3px;
@@ -216,7 +216,7 @@ ion-item{
overflow: auto; overflow: auto;
} }
.div-search{ .div-search{
font-size: 45px; font-size: rem(45);
float: left; float: left;
margin: 0 0 0 10px margin: 0 0 0 10px
} }
@@ -230,7 +230,7 @@ ion-item{
width: 100%; width: 100%;
} }
.div-profile{ .div-profile{
font-size: 45px; font-size: rem(45);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
@@ -244,14 +244,14 @@ ion-item{
background-color: white; background-color: white;
border-radius: 27.5px; border-radius: 27.5px;
border: solid 1px #ebebeb; border: solid 1px #ebebeb;
font-size: 14px; font-size: rem(14);
.icon{ .icon{
color: #797979; color: #797979;
width: 41px; width: 41px;
height: 41px; height: 41px;
display: flex; display: flex;
justify-content: center; justify-content: center;
font-size: 25px; font-size: rem(25);
align-items: center; align-items: center;
} }
.input-text{ .input-text{
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -2
View File
@@ -46,11 +46,11 @@
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' && !hideRefreshBtn "> <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' && !hideRefreshBtn ">
<ion-icon class="ml-10" src="assets/images/theme/gov/crescente.svg" ></ion-icon> <ion-icon class="ml-10 font-25-rem" src="assets/images/theme/gov/crescente.svg" ></ion-icon>
</div> </div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' && !hideRefreshBtn "> <div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' && !hideRefreshBtn ">
<ion-icon class="ml-10" src="assets/images/theme/gov/decrescente.svg" ></ion-icon> <ion-icon class="ml-10 font-25-rem" src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
</div> </div>
</div> </div>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+28 -26
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
ion-content{ ion-content{
/* --padding-top:15px; */ /* --padding-top:15px; */
/* --padding-end:15px; /* --padding-end:15px;
@@ -34,7 +36,7 @@ ion-content{
.title{ .title{
width: fit-content; width: fit-content;
font-size: 25px !important; font-size: rem(25) !important;
float: left; float: left;
} }
.btn-no-color{ .btn-no-color{
@@ -44,7 +46,7 @@ ion-content{
.title-icon{ .title-icon{
float: right; float: right;
margin-right: 20px; margin-right: 20px;
font-size: 30px; font-size: rem(30);
color: #42b9fe; color: #42b9fe;
} }
.title-icons{ .title-icons{
@@ -90,7 +92,7 @@ ion-content{
border: 0!important; border: 0!important;
.div-search{ .div-search{
font-size: 45px; font-size: rem(45);
float: left; float: left;
margin: 0 0 0 10px margin: 0 0 0 10px
} }
@@ -104,7 +106,7 @@ ion-content{
width: 100%; width: 100%;
} }
.div-profile{ .div-profile{
font-size: 45px; font-size: rem(45);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
@@ -173,7 +175,7 @@ ion-content{
.exp-card-icon{ .exp-card-icon{
width: fit-content; width: fit-content;
font-size: 48px; font-size: rem(48);
float: left !important; float: left !important;
} }
.exp-card-text{ .exp-card-text{
@@ -188,17 +190,17 @@ ion-content{
margin: 0 auto; margin: 0 auto;
} }
.exp-card ion-icon{ .exp-card ion-icon{
font-size: 48px !important; font-size: rem(48) !important;
} }
.exp-card fa-icon{ .exp-card fa-icon{
font-size: 30px; font-size: rem(30);
padding: 0 1px 0 1px; padding: 0 1px 0 1px;
margin: 6px; margin: 6px;
//border: 1px solid #ccc; //border: 1px solid #ccc;
color: #797979; color: #797979;
} }
.exp-card-title{ .exp-card-title{
font-size: 15px; font-size: rem(15);
color: var(--title-text-color);; color: var(--title-text-color);;
font-family: Roboto; font-family: Roboto;
font-weight: bold; font-weight: bold;
@@ -212,7 +214,7 @@ ion-content{
} }
.exp-card-content{ .exp-card-content{
font-size: 13px; font-size: rem(13);
color: #797979; color: #797979;
margin: 11px 0 0; margin: 11px 0 0;
font-family: Roboto; font-family: Roboto;
@@ -238,11 +240,11 @@ ion-content{
float: left; float: left;
} }
.title{ .title{
font-size: 25px; font-size: rem(25);
} }
.div-icon{ .div-icon{
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: auto; overflow: auto;
} }
@@ -256,7 +258,7 @@ ion-content{
border:1px solid #e9e9e9 !important; border:1px solid #e9e9e9 !important;
background-color: #fff !important; background-color: #fff !important;
margin-bottom: 10px !important; margin-bottom: 10px !important;
padding: 15px; padding: rem(15);
.item{ .item{
background-color: var(--white); background-color: var(--white);
@@ -267,7 +269,7 @@ ion-content{
width: 100%; width: 100%;
float: left; float: left;
font-family: Roboto; font-family: Roboto;
font-size: 12pt; font-size: rem(16);
font-weight: 700; font-weight: 700;
color: var(--title-text-color); color: var(--title-text-color);
padding-left: 3px; padding-left: 3px;
@@ -300,7 +302,7 @@ ion-content{
} }
} }
.item-middle-detail{ .item-middle-detail{
font-size: 10pt; font-size: rem(13);
width: 100%; width: 100%;
overflow: auto; overflow: auto;
padding-left: 3px; padding-left: 3px;
@@ -323,7 +325,7 @@ ion-content{
} }
} }
.item-middle-detail-extra{ .item-middle-detail-extra{
font-size: 10pt; font-size: rem(13);
padding-left: 3px; padding-left: 3px;
//border: 1px solid red; //border: 1px solid red;
@@ -337,7 +339,7 @@ ion-content{
} }
} }
.item-bottom-detail{ .item-bottom-detail{
font-size: 12pt; font-size: rem(16);
width: 100%; width: 100%;
overflow: auto; overflow: auto;
margin-top: 10px; margin-top: 10px;
@@ -361,7 +363,7 @@ ion-content{
.item-date{ .item-date{
width: auto; width: auto;
font-family: Roboto; font-family: Roboto;
font-size: 10pt; font-size: rem(13);
font-weight: normal; font-weight: normal;
font-stretch: normal; font-stretch: normal;
font-style: normal; font-style: normal;
@@ -626,7 +628,7 @@ ion-content{
//margin-top: 28px; //margin-top: 28px;
width: 45px; width: 45px;
float: left; float: left;
font-size: 40px; font-size: rem(40);
.item-icon ion-icon{ .item-icon ion-icon{
color: #061b52; color: #061b52;
@@ -636,7 +638,7 @@ ion-content{
//margin-top: 23px; //margin-top: 23px;
width: 45px; width: 45px;
float: left; float: left;
font-size: 40px; font-size: rem(40);
} }
.item-content{ .item-content{
@@ -653,26 +655,26 @@ ion-content{
.item-content-date{ .item-content-date{
color: #797979; color: #797979;
font-size: 13px; font-size: rem(13);
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
} }
.item-content-title{ .item-content-title{
color: var(--title-text-color); color: var(--title-text-color);
font-size: 15px; font-size: rem(15);
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
} }
.item-content-detail{ .item-content-detail{
color: #000000; color: #000000;
font-size: 13px; font-size:rem(13);
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
} }
.item-options{ .item-options{
color: var(--box-hover-background-color); color: var(--box-hover-background-color);
width: 25px; width: 25px;
font-size: 20px; font-size: rem(20);
} }
.item-content-date-active, .item-content-title-active, .item-content-detail-active{ .item-content-date-active, .item-content-title-active, .item-content-detail-active{
color: #fff; color: #fff;
@@ -692,7 +694,7 @@ ion-content{
.new-task-count{ .new-task-count{
color: red; color: red;
font-size: 13px; font-size: rem(13);
} }
@@ -700,14 +702,14 @@ ion-content{
background-color: white; background-color: white;
border-radius: 27.5px; border-radius: 27.5px;
border: solid 1px #ebebeb; border: solid 1px #ebebeb;
font-size: 14px; font-size: rem(14);
.icon{ .icon{
color: #797979; color: #797979;
width: 41px; width: 41px;
height: 41px; height: 41px;
display: flex; display: flex;
justify-content: center; justify-content: center;
font-size: 25px; font-size: rem(25);
align-items: center; align-items: center;
} }
.input-text{ .input-text{
src/app/pages/publications/publication-detail/publication-detail-routing.module.ts
-17
View File
@@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { PublicationDetailPage } from './publication-detail.page';
const routes: Routes = [
{
path: '',
component: PublicationDetailPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class PublicationDetailPageRoutingModule {}
src/app/pages/publications/publication-detail/publication-detail.module.ts
-20
View File
@@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module';
import { PublicationDetailPage } from './publication-detail.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
PublicationDetailPageRoutingModule
],
declarations: [PublicationDetailPage]
})
export class PublicationDetailPageModule {}
src/app/pages/publications/publication-detail/publication-detail.page.html
-75
View File
@@ -1,75 +0,0 @@
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="content-container">
<div *ngIf="publication.Title != ''">
<div class="title-content">
<div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " tappable (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " tappable (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title"> {{publication.Title}}</ion-label>
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
</div>
</div>
<div class="post-item">
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
<div class="post-description">
<pre class="text">{{publication.Message}}</pre>
</div>
</div>
</div>
<div *ngIf="publication.Title == ''">
<div class="title-content">
<div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
<p class="post-data"><ion-skeleton-text animated style="width: 20%;"></ion-skeleton-text></p>
</div>
</div>
<div class="post-item">
<div class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
<div class="post-description">
<p><ion-skeleton-text animated></ion-skeleton-text></p>
<p><ion-skeleton-text animated></ion-skeleton-text></p>
</div>
</div>
</div>
</div>
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar class="footer-toolbar">
<ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start">
<button class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
<ion-label>Eliminar</ion-label>
</button>
</ion-buttons>
<ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.editPost])" slot="end">
<button class="btn-ok" fill="clear" color="#fff" (click)="editPost('3')">
<ion-label>Editar</ion-label>
</button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/pages/publications/publication-detail/publication-detail.page.scss
-89
View File
@@ -1,89 +0,0 @@
ion-content{
--background: transparent;
--border-radius: 30px;
}
ion-footer{
background: #fff;
}
ion-toolbar{
border-width: 0 !important;
}
.div-top-header{
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
padding-top: 15px;
border: 0!important;
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 140px;
margin: 5px 0 0px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
.content-top{
background: #f3f2f2;
height: 20px;
margin: 0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content-container{
width: 100%;
margin:0 auto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background: #ffffff;
height: 100%;
padding: 25px 0px 0 0px;
overflow: auto;
}
.title-content{
margin: 0px auto;
overflow: auto;
padding: 0 !important;
}
.back-icon{
width: auto;
float: left;
font-size: 35px;
overflow: auto;
}
.div-title{
/* padding: 0!important; */
float: left;
margin: 2.5px 0 0 5px;
}
.title{
font-size: 25px;
}
.post-img{
width: 100%;
height: 400px;
margin: 0 auto;
border-radius: 0px!important;
overflow: hidden;
}
.post-img img{
width: 100%;
height: 100%;
object-fit: cover;
}
.post-description{
margin: 0 auto;
margin-bottom: 35px;
}
src/app/pages/publications/publication-detail/publication-detail.page.spec.ts
-24
View File
@@ -1,24 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { PublicationDetailPage } from './publication-detail.page';
describe('PublicationDetailPage', () => {
let component: PublicationDetailPage;
let fixture: ComponentFixture<PublicationDetailPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PublicationDetailPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(PublicationDetailPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/publications/publication-detail/publication-detail.page.ts
-146
View File
@@ -1,146 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { AnimationController, ModalController, NavParams } from '@ionic/angular';
import { Publication } from 'src/app/models/publication';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
import { ImageModalPage } from '../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../new-publication/new-publication.page';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-publication-detail',
templateUrl: './publication-detail.page.html',
styleUrls: ['./publication-detail.page.scss'],
})
export class PublicationDetailPage implements OnInit {
showLoader: boolean;
publicationId: string;
folderId: string;
publication: Publication;
constructor(
private modalController: ModalController,
private navParams:NavParams,
private publications:PublicationsService,
private toastService: ToastService,
private RouteService: RouteService,
public ThemeService: ThemeService,
public p:PermissionService,
private httpErrorHandle: HttpErrorHandle ) {
this.publicationId = this.navParams.get('publicationId');
/* this.folderId = this.navParams.get('folderIdId'); */
this.publication = {
DateIndex: null,
DocumentId: null,
ProcessId:'',
Title:'',
Message: '',
/* image: null, */
DatePublication: null,
FileBase64: '',
OriginalFileName: '',
FileExtension: '',
};
}
ngOnInit() {
this.getPublicationDetail();
}
doRefresh(event) {
this.getPublicationDetail();
setTimeout(() => {
try {
event?.target?.complete();
} catch(error) {}
}, 2000);
}
getPublicationDetail() {
this.showLoader = true;
this.publications.GetPublicationById(this.publicationId).subscribe(res=>{
/* this.publication = res; */
this.publication = {
DateIndex: res.DateIndex,
DocumentId: res.DocumentId,
ProcessId:res.ProcessId,
Title:res.Title,
Message: res.Message,
DatePublication: res.DatePublication,
FileBase64: "data:image/jpg;base64," + res.FileBase64,
OriginalFileName: res.OriginalFileName,
FileExtension: 'jpeg',
}
this.showLoader = false;
});
}
getFromDB() {
}
close() {
this.RouteService.goBack()
}
async deletePost() {
const loader = this.toastService.loading()
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação')
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
}
async editPost(publicationType:any) {
const modal = await this.modalController.create({
component: NewPublicationPage,
componentProps:{
publicationType: publicationType,
publication: this.publication,
},
cssClass: 'new-publication modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(()=>{
setTimeout(() => {
this.getPublicationDetail();
}, 5000);
});
}
openPreview(imageUrl:string){
this.modalController.create({
component: ImageModalPage,
componentProps: {
imageUrl:imageUrl,
}
}).then(modal => modal.present());
}
}
src/app/pages/publications/publications.page.html
+8 -10
View File
@@ -18,7 +18,7 @@
<div class="title-content width-100 d-flex justify-space-between"> <div class="title-content width-100 d-flex justify-space-between">
<div class="div-title flex-grow-1"> <div class="div-title flex-grow-1">
<ion-label class="title ">Acções</ion-label> <ion-label class="title font-25-em">Acções</ion-label>
</div> </div>
<div class="div-icon"> <div class="div-icon">
@@ -45,17 +45,15 @@
[class.item-active]="evento.ProcessId == idSelected" [class.item-active]="evento.ProcessId == idSelected"
(click)="goToPublicationsList(evento.ProcessId)"> (click)="goToPublicationsList(evento.ProcessId)">
<div class="item-icon2"> <div class="item-icon2">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon> <ion-icon class="font-40-em" *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && evento.ProcessId != idSelected " slot="end" src='assets/images/theme/gov/icons-nav-actions.svg'></ion-icon> <ion-icon class="font-40-em" *ngIf="ThemeService.currentTheme == 'gov' && evento.ProcessId != idSelected " slot="end" src='assets/images/theme/gov/icons-nav-actions.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && evento.ProcessId == idSelected " slot="end" src='assets/images/theme/gov/icons-nav-actions-hover.svg'></ion-icon> <ion-icon class="font-40-em" *ngIf="ThemeService.currentTheme == 'gov' && evento.ProcessId == idSelected " slot="end" src='assets/images/theme/gov/icons-nav-actions-hover.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' && evento.ProcessId != idSelected " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-nav-actions.svg'></ion-icon> <ion-icon class="font-40-em" *ngIf="ThemeService.currentTheme == 'doneIt' && evento.ProcessId != idSelected " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-nav-actions.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' && evento.ProcessId == idSelected " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-nav-actions-hover.svg'></ion-icon> <ion-icon class="font-40-em" *ngIf="ThemeService.currentTheme == 'doneIt' && evento.ProcessId == idSelected " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-nav-actions-hover.svg'></ion-icon>
</div> </div>
<div class="item-content flex-grow-1"> <div class="item-content flex-grow-1">
<ion-label> <p class="item-content-date font-13-em" [class.item-content-date-active]="evento.ProcessId == idSelected">{{getDate(evento.DateBegin)}}</p>
<p class="item-content-date" [class.item-content-date-active]="evento.ProcessId == idSelected">{{getDate(evento.DateBegin)}}</p> <p class="item-content-title font-15-em" [class.item-content-title-active]="evento.ProcessId == idSelected">{{evento.Description}}</p>
<p class="item-content-title" [class.item-content-title-active]="evento.ProcessId == idSelected">{{evento.Description}}</p>
</ion-label>
</div> </div>
</ion-item> </ion-item>
<ion-item-options class="members-options" side="end"> <ion-item-options class="members-options" side="end">
src/app/pages/publications/publications.page.scss
+29 -7
View File
@@ -1,3 +1,15 @@
@media only screen and (min-width: 100px) {
:host{
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
:host{
font-size: 16px;
}
}
:host{ :host{
// background: #0782c9; // background: #0782c9;
} }
@@ -61,9 +73,6 @@ ion-toolbar{
.div-title{ .div-title{
padding: 0!important; padding: 0!important;
} }
.title{
font-size: 25px;
}
.div-icon{ .div-icon{
display: flex; display: flex;
/* width: 45px; /* width: 45px;
@@ -125,9 +134,7 @@ ion-toolbar{
} }
.item-icon2{ .item-icon2{
//margin-top: 23px; //margin-top: 23px;
width: 45px;
float: left; float: left;
font-size: 40px;
} }
.item-content{ .item-content{
@@ -144,13 +151,11 @@ ion-toolbar{
.item-content-date{ .item-content-date{
color: #797979; color: #797979;
font-size: 13px;
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
} }
.item-content-title{ .item-content-title{
color: var(--title-text-color); color: var(--title-text-color);
font-size: 15px;
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
} }
@@ -247,3 +252,20 @@ ion-toolbar{
} }
} }
@media only screen and (min-width: 100px) {
.item-icon2, .title-content, .main-content, .item {
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
.item-icon2, .title-content, .main-content, .item {
font-size: 16px;
}
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+13 -13
View File
@@ -8,17 +8,17 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="content-container"> <div class="content-container viewport-font-size">
<div *ngIf="publication.Title != ''" class="d-flex flex-column height-100"> <div *ngIf="publication.Title != ''" class="d-flex flex-column height-100">
<div class="title-content px-20 width-100 "> <div class="title-content px-20 width-100 ">
<div class="back-icon cursor-pointer" (click)="goBack()"> <div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div> </div>
<div class="div-title"> <div class="div-title">
<ion-label class="title"> {{publication.Title}} </ion-label> <p class="title font-25-em"> {{publication.Title}} </p>
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p> <p class="post-data font-16-em">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
</div> </div>
</div> </div>
@@ -30,7 +30,7 @@
<img src="/assets/icon/icon-no-image.svg" alt="image"> <img src="/assets/icon/icon-no-image.svg" alt="image">
</div> </div>
<div class="post-description px-20"> <div class="post-description px-20">
<pre class="text">{{publication.Message}}</pre> <pre class="text font-13-em">{{publication.Message}}</pre>
</div> </div>
</div> </div>
</div> </div>
@@ -38,9 +38,9 @@
<div *ngIf="publication.Title == ''" class="d-flex flex-column"> <div *ngIf="publication.Title == ''" class="d-flex flex-column">
<div class="title-content width-100"> <div class="title-content width-100">
<div class="back-icon cursor-pointer"> <div class="back-icon cursor-pointer">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div> </div>
<div class="div-title"> <div class="div-title">
<ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label> <ion-label class="title"><ion-skeleton-text animated style="width: 60%;"></ion-skeleton-text></ion-label>
@@ -61,16 +61,16 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer> <ion-footer class="viewport-font-size">
<ion-toolbar class="footer-toolbar"> <ion-toolbar class="footer-toolbar">
<ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start"> <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.deletePost])" slot="start">
<button *ngIf="publication.ProcessId" class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()"> <button *ngIf="publication.ProcessId" class="btn-delete" fill="clear" color="#ffe0e0" (click)="deletePost()">
<ion-label>Eliminar</ion-label> <ion-label class="font-16-em">Eliminar</ion-label>
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.editPost])" slot="end"> <ion-buttons *ngIf="p.userPermission([p.permissionList.Actions.editPost])" slot="end">
<button *ngIf="publication.ProcessId" class="btn-ok" fill="clear" color="#fff" (click)="editPost('3')"> <button *ngIf="publication.ProcessId" class="btn-ok" fill="clear" color="#fff" (click)="editPost('3')">
<ion-label>Editar</ion-label> <ion-label class="font-16-em">Editar</ion-label>
</button> </button>
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
+2 -31
View File
@@ -12,32 +12,7 @@
/* --background:#0782c9; */ /* --background:#0782c9; */
border-width: 0 !important; border-width: 0 !important;
} }
.div-top-header{
margin: 0 auto;
background-color: #0782c9;
overflow: auto;
padding-top: 15px;
border: 0!important;
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 140px;
margin: 5px 0 0px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
.content-top{ .content-top{
background: #f3f2f2; background: #f3f2f2;
height: 20px; height: 20px;
@@ -62,17 +37,13 @@
.back-icon{ .back-icon{
width: auto; width: auto;
float: left; float: left;
font-size: 35px;
overflow: auto; overflow: auto;
} }
.div-title{ .div-title{
/* padding: 0!important; */ /* padding: 0!important; */
float: left; float: left;
margin: 2.5px 0 0 5px;
}
.title{
font-size: 25px;
} }
.post-img{ .post-img{
width: 100%; width: 100%;
height: 400px; height: 400px;
src/app/pages/publications/view-publications/view-publications.page.html
+14 -14
View File
@@ -1,18 +1,18 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<!-- <ion-toolbar class="bg-blue"> --> <!-- <ion-toolbar class="bg-blue"> -->
<div class="main-header"> <div class="main-header viewport-font-size">
<div class="title-content d-flex width-100"> <div class="title-content d-flex width-100">
<div class="back-icon cursor-pointer" (click)="goBack()"> <div class="cursor-pointer viewport-font-size" (click)="goBack()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon> <ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
</div> </div>
<div *ngIf="publicationItem[folderId]?.DateBegin != null" class="div-title flex-grow-1"> <div *ngIf="publicationItem[folderId]?.DateBegin != null" class="div-title flex-grow-1">
<ion-label class="title">{{publicationItem[folderId].Description}}</ion-label> <p class="title font-25-em mb-10-em">{{publicationItem[folderId].Description}}</p>
<p class="item-content-detail">{{publicationItem[folderId].Detail}}</p> <p class="item-content-detail font-13-em">{{publicationItem[folderId].Detail}}</p>
<p class="item-content-date" >{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}</p> <p class="item-content-date font-13-em" >{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}</p>
</div> </div>
<div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationItem[folderId]" class="actions-icon cursor-pointer" (click)="AddPublication('2',publicationItem[folderId].ProcessId)"> <div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationItem[folderId]" class="cursor-pointer font-35-em" (click)="AddPublication('2',publicationItem[folderId].ProcessId)">
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> --> <!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-add.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-add.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-add.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-add.svg'></ion-icon>
@@ -28,7 +28,7 @@
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-container background-white height-100 overflow-y-auto"> <div class="main-container background-white height-100 overflow-y-auto viewport-font-size">
<ion-content *ngIf="publicationItem[folderId]"> <ion-content *ngIf="publicationItem[folderId]">
<ion-card *ngFor="let publication of publicationList[folderId] let i = index" <ion-card *ngFor="let publication of publicationList[folderId] let i = index"
(click)="goToPublicationDetail(publication.DocumentId)" (click)="goToPublicationDetail(publication.DocumentId)"
@@ -39,13 +39,13 @@
</div> </div>
<div class="post-content px-20"> <div class="post-content px-20">
<div class="post-title-time"> <div class="post-title-time">
<div class="post-title"> <div class="post-title font-15-em">
<ion-label>{{publication.Title}}</ion-label> <ion-label>{{publication.Title}}</ion-label>
</div> </div>
<div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy HH:mm'}}</div> <div class="post-data font-13-em">{{publication.DatePublication | date: 'dd-MM-yy HH:mm'}}</div>
</div> </div>
<div class="post-description"> <div class="post-description ">
<pre class="text">{{publication.Message}}</pre> <pre class="text font-13-em">{{publication.Message}}</pre>
</div> </div>
</div> </div>
</ion-card-content> </ion-card-content>
src/app/pages/publications/view-publications/view-publications.page.scss
+9 -12
View File
@@ -1,7 +1,7 @@
:host{ :host{
background: transparent; background: transparent;
padding: 0!important; padding: 0!important;
} }
ion-content{ ion-content{
--background: transparent; --background: transparent;
--border-radius: 30px; --border-radius: 30px;
@@ -97,7 +97,6 @@
color: #000 !important; color: #000 !important;
} }
.title{ .title{
font-size: 25px;
color: #000 !important; color: #000 !important;
} }
@@ -106,16 +105,13 @@
} }
.actions-icon ion-icon{ .actions-icon ion-icon{
margin-left: 10px; margin-left: 10px;
font-size: 35px;
float: right; float: right;
} }
.item-content-date{ .item-content-date{
color: #797979; color: #797979;
font-size: 13px;
} }
.item-content-detail{ .item-content-detail{
color: #000000; color: #000000;
font-size: 13px;
} }
.post-item{ .post-item{
width: 100%; width: 100%;
@@ -148,18 +144,19 @@
.post-title{ .post-title{
width: 60%; width: 60%;
float: left; float: left;
font-size: 15px;
color: #0d89d1; color: #0d89d1;
} }
.post-data{ .post-data{
width: 40%; width: 40%;
float: left; float: left;
font-size: 13px;
color: #797979; color: #797979;
text-align: right; text-align: right;
} }
.post-description{ .post-description{
font-size: 13px; color: #000;
color: #000;
} }
.font-13-em {
font-size: 0.8125em !important;
}
src/app/services/theme.service.ts
+1 -3
View File
@@ -17,9 +17,7 @@ export class ThemeService {
currentTheme: 'gov' | 'default' | 'doneIt' = this.defaultTheme currentTheme: 'gov' | 'default' | 'doneIt' = this.defaultTheme
keyName: string keyName: string
constructor( constructor() {
private storageservice: StorageService
) {
this.keyName = (SHA1("ThemeService")).toString() this.keyName = (SHA1("ThemeService")).toString()
let restore = localstoreService.get(this.keyName, { let restore = localstoreService.get(this.keyName, {
src/app/services/toast.service.ts
+12 -1
View File
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { AnimationController, ModalController, ToastController } from '@ionic/angular'; import { AnimationController, ModalController, ToastController } from '@ionic/angular';
import { BadRequestPage } from '../shared/popover/bad-request/bad-request.page'; import { BadRequestPage } from '../shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from '../shared/popover/success-message/success-message.page'; import { SuccessMessagePage } from '../shared/popover/success-message/success-message.page';
import { ThemeService } from 'src/app/services/theme.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -10,6 +11,7 @@ export class ToastService {
constructor( constructor(
public toastController: ToastController, public toastController: ToastController,
public ThemeService: ThemeService,
) { } ) { }
ngOnInit() {} ngOnInit() {}
@@ -188,6 +190,15 @@ export class ToastService {
} }
async ViewEventOption() {
// this.ThemeService.currentTheme == 'default'
// this.ThemeService.currentTheme == 'gov'
// this.ThemeService.currentTheme == 'doneIt'
if(this.ThemeService.currentTheme == 'default') {
} else if (this.ThemeService.currentTheme == 'gov') {}
}
async notificationMessage(message?: any, callback?: any,data?: any) { async notificationMessage(message?: any, callback?: any,data?: any) {
@@ -266,4 +277,4 @@ export class ToastService {
} }
export const ToastsService = new ToastService(new ToastController()) export const ToastsService = new ToastService(new ToastController(), new ThemeService())
src/app/shared/agenda/view-event/view-event.page.html
+14 -2
View File
@@ -14,14 +14,26 @@
</div> </div>
<div class="div-icon d-flex align-base"> <div class="div-icon d-flex align-base">
<button class="btn-no-color" (click)="editEvent()"> <!-- <button class="btn-no-color" (click)="editEvent()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="edit" slot="end" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-edit.svg" ></ion-icon>
</button> </button>
<button class="btn-no-color" (click)="deleteYesOrNo()"> <button class="btn-no-color" (click)="deleteYesOrNo()">
<ion-icon class="delete" name="trash-sharp"></ion-icon> <ion-icon class="delete" name="trash-sharp"></ion-icon>
</button> </button> -->
<div class="div-icon" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
</div>
<div *ngIf="loadedEvent.Subject">
<div (click)="editEvent()">Editar</div>
<div (click)="deleteYesOrNo()">Apagar</div>
<div id="desktop-create-chat-from-event" (click)="openNewGroupPage()">Criar Conversa</div>
</div>
</div> </div>
</div> </div>
src/app/shared/header/header.page.html
+10 -10
View File
@@ -3,11 +3,11 @@
<div class="mobile pt-20 d-flex div-top-header justify-space-between"> <div class="mobile pt-20 d-flex div-top-header justify-space-between">
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="div-search"> <div title="Pesquisa" *ngIf="!hideSearchBtn" class="div-search viewport-font-size">
<div (click)="openSearch()"> <div (click)="openSearch()">
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-45" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-45-em" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
<ion-icon *ngIf=" ThemeService.currentTheme == 'default' " class="font-45" src='assets/images/icons-search.svg'></ion-icon> <ion-icon *ngIf=" ThemeService.currentTheme == 'default' " class="font-45-em" src='assets/images/icons-search.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45" src='assets/images/theme/gov/icons-search.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-45-em" src='assets/images/theme/gov/icons-search.svg'></ion-icon>
</div> </div>
</div> </div>
@@ -34,11 +34,12 @@
</div> </div>
</div> </div>
<div title="Perfil" class="div-profile cursor-pointer" (click)="openProfile()"> <div title="Perfil" class="div-profile cursor-pointer viewport-font-size " (click)="openProfile()">
<!-- <div *ngIf="this.notificationLength > 0" class="icon-badge">{{notificationLength}}</div> --> <!-- <div *ngIf="this.notificationLength > 0" class="icon-badge">{{notificationLength}}</div> -->
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon font-45-em" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon font-45-em" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
<div class="profile-text"> <div class="profile-text">
<div *ngIf="this.notificationLength > 0" class="icon-badge" <div *ngIf="this.notificationLength > 0" class="icon-badge"
@@ -155,8 +156,7 @@
</div> </div>
</div> </div>
<div title="Perfil" class="div-profile d-flex cursor-pointer" (click)="openProfile()"> <div title="Perfil" class="div-profile d-flex cursor-pointer font-45" (click)="openProfile()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="icon" src='assets/images/theme/doneIt/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
src/app/shared/header/header.page.scss
+1 -2
View File
@@ -9,7 +9,7 @@
.div-logo{ .div-logo{
background: transparent; background: transparent;
width: em(140px); width: em(140);
justify-content: center; justify-content: center;
display: flex; display: flex;
color: black; color: black;
@@ -79,7 +79,6 @@
.div-profile { .div-profile {
height: fit-content; height: fit-content;
font-size: 45px;
justify-content: flex-end; justify-content: flex-end;
display: flex; display: flex;
background-color: transparent; background-color: transparent;
src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss
+4 -1
View File
@@ -1,3 +1,6 @@
@import '~src/function.scss';
.container{ .container{
--padding-top:20px !important; --padding-top:20px !important;
--padding-bottom:20px !important; --padding-bottom:20px !important;
@@ -10,7 +13,7 @@
.arrow-right-icon{ .arrow-right-icon{
width: 37px; width: 37px;
float: right; float: right;
font-size: 35px; font-size: rem(35);
overflow: hidden; overflow: hidden;
} }
} }
src/environments/suport/oapr.ts
+2 -2
View File
@@ -35,8 +35,8 @@ export const oaprDev: Environment = {
despachoLabel2: 'Despachos Presidênciais', despachoLabel2: 'Despachos Presidênciais',
production: false, production: false,
domain: 'oapr.gov.ao', domain: 'oapr.gov.ao',
defaultuser: 'gmanuel@oapr.gov.ao', defaultuser: '',
defaultuserpwd: 'M@p#2023', defaultuserpwd: '',
chatOffline: true, chatOffline: true,
presidential: true, presidential: true,
version: versionData, version: versionData,
src/function.scss
+3 -2
View File
@@ -1,3 +1,4 @@
@use 'sass:math';
// =============== Custom function ============================== // =============== Custom function ==============================
@@ -34,14 +35,14 @@
// convert px to rem // convert px to rem
@function rem($size) { @function rem($size) {
$remSize: to-number($size) / 16; $remSize: math.div(to-number($size), 16);
//Default font size on html is 16px; //Default font size on html is 16px;
@return #{$remSize}rem; @return #{$remSize}rem;
} }
// convert px to em // convert px to em
@function em($size) { @function em($size) {
$remSize: to-number($size) / 16px; $remSize: math.div(to-number($size), 16);
@return #{$remSize}em; @return #{$remSize}em;
} }
src/global.scss
+94 -38
View File
@@ -24,8 +24,7 @@
@import "~@ionic/angular/css/text-alignment.css"; @import "~@ionic/angular/css/text-alignment.css";
@import "~@ionic/angular/css/text-transformation.css"; @import "~@ionic/angular/css/text-transformation.css";
@import "~@ionic/angular/css/flex-utils.css"; @import "~@ionic/angular/css/flex-utils.css";
@import '~src/function.scss';
// calendar // calendar
@@ -108,7 +107,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.cal-time{ .cal-time{
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
color: #797979; color: #797979;
} }
@@ -124,12 +123,12 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
color: black; color: black;
.timeline-start-time, .timeline-location{ .timeline-start-time, .timeline-location{
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
margin-right: 10px; margin-right: 10px;
} }
.timeline-event-discription{ .timeline-event-discription{
font-family: Roboto; font-family: Roboto;
font-size: 15px; font-size: rem(15);
font-weight: bold; font-weight: bold;
} }
} }
@@ -213,7 +212,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.calendar-profile{ .calendar-profile{
font-size: 36px font-size: rem(36)
} }
@@ -600,27 +599,53 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.calendar-component .monthview-container table.table { .calendar-component .monthview-container table.table {
td { td {
width: 50px; div {
height: 40px; padding-left: 0px;
div { }
padding-left: 0px; display: flex;
} align-content: center;
display: flex; justify-content: center;
align-content: center; }
justify-content: center;
}
td div:not(.day, .day-container, .number) {
width: 30px !important;
height: 30px;
}
tr { tr {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
}
tbody {
tr {
td {
padding: em(8) !important;
div {
width: 30px !important;
height: 30px;
}
div.number {
font-size: em(18) !important;
}
}
}
} }
} }
@media only screen and (min-width: 100px) {
.calendar-component .monthview-container table.table{
font-size: 12px;
}
}
@media only screen and (min-width: 500px) {
.calendar-component .monthview-container table.table {
font-size: 16px;
}
}
// agenda attendee component // agenda attendee component
.attendee-search-bar input{ .attendee-search-bar input{
border: 1px solid #cecece !important; border: 1px solid #cecece !important;
@@ -642,7 +667,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
-o-border-radius: 3px !important; -o-border-radius: 3px !important;
} }
.title-icon { .title-icon {
font-size: 40px !important; font-size: rem(40) !important;
color: #42b9fe; color: #42b9fe;
overflow: auto; overflow: auto;
} }
@@ -653,14 +678,18 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
background: transparent; background: transparent;
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
ion-icon {
font-size: 35px;
}
} }
.btn-no-color:focus { .btn-no-color:focus {
outline: 0; outline: 0;
} }
.btn-no-color {
ion-icon {
font-size: rem(35);
}
}
// center // center
app-diploma-assinar ion-content .main-content, app-diploma-assinar ion-content .main-content,
@@ -976,7 +1005,7 @@ background: rgb(92, 92, 92);
align-items: center; align-items: center;
} }
.message { .message {
font-size: 12pt; font-size: rem(16);
} }
} }
@@ -1015,7 +1044,7 @@ background: rgb(92, 92, 92);
align-items: center; align-items: center;
} }
.message { .message {
font-size: 12pt; font-size: rem(16);
} }
} }
@@ -1108,7 +1137,7 @@ background: rgb(92, 92, 92);
.input-errror-message{ .input-errror-message{
margin-top: -16px; margin-top: -16px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 11pt; font-size: rem(15);
} }
@@ -1216,7 +1245,7 @@ ngx-mat-datetime-content{
} }
.menuButton{ .menuButton{
font-size: 14px; font-size: rem(14);
width: 100%; width: 100%;
background: none; background: none;
padding: 10px 5px 10px 5px; padding: 10px 5px 10px 5px;
@@ -1289,10 +1318,10 @@ ngx-mat-datetime-content{
color: #d24726; color: #d24726;
} }
.icon-size-45{ .icon-size-45{
font-size: 45px !important; font-size: rem(45) !important;
} }
.icon-size-27{ .icon-size-27{
font-size: 27px !important; font-size: rem(27) !important;
color: #797979; color: #797979;
} }
.menu-icon{ .menu-icon{
@@ -1439,7 +1468,7 @@ ngx-mat-datetime-content{
$font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; $font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
$font-size: 11pt; $font-size: rem(15);
ion-row ul > li{ ion-row ul > li{
font-family: $font-family; font-family: $font-family;
@@ -1471,14 +1500,14 @@ ion-textarea.heigh-200 textarea {
} }
.dead-line { .dead-line {
font-size: 12px; font-size: rem(12);
color: red; color: red;
} }
.new-task { .new-task {
border-radius: 20px; border-radius: 20px;
background: #efefef; background: #efefef;
font-size: 12px; font-size: rem(12);
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #46465b; color: #46465b;
@@ -1490,7 +1519,7 @@ ion-textarea.heigh-200 textarea {
padding-left: 10px; padding-left: 10px;
padding-right: 5px; padding-right: 5px;
border-radius: 1px; border-radius: 1px;
font-size: 14px; font-size: rem(14);
width: 110px; width: 110px;
@@ -1520,14 +1549,14 @@ ion-textarea.heigh-200 textarea {
background-color: white; background-color: white;
border-radius: 27.5px; border-radius: 27.5px;
border: solid 1px #ebebeb; border: solid 1px #ebebeb;
font-size: 14px; font-size: rem(14);
.icon{ .icon{
color: #797979; color: #797979;
width: 41px; width: 41px;
height: 41px; height: 41px;
display: flex; display: flex;
justify-content: center; justify-content: center;
font-size: 25px; font-size: rem(25);
align-items: center; align-items: center;
} }
.input-text{ .input-text{
@@ -1539,4 +1568,31 @@ ion-textarea.heigh-200 textarea {
} }
.row-reverse { display: flex; flex-direction: row-reverse; } .row-reverse { display: flex; flex-direction: row-reverse; }
.transparent--background {
background-color: transparent;
}
@media only screen and (min-width: 100px) {
html, body, .viewport-font-size {
font-size: 14px;
}
}
@media only screen and (min-width: 500px) {
html, body, .viewport-font-size {
font-size: 16px;
}
}
.swiper-slide {
font-size: unset !important;
}
src/style/main.scss
+100 -93
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
// overflow // overflow
.v-application .overflow-auto { .v-application .overflow-auto {
overflow: auto !important; overflow: auto !important;
@@ -178,6 +180,99 @@
flex: 0; flex: 0;
} }
@for $i from 0 through 50 {
.font-#{$i}-rem {
font-size: rem($i);
}
.font-#{$i}-em {
font-size: em($i);
}
}
@for $i from 0 through 10 {
$size: $i * 5;
$properties: "margin" "m", "padding" "p";
@each $property, $short in $properties {
// ============================= EM ========================================
// all directions
.#{$short}a-#{$size}-em {
#{$property}-left: em($size) !important;
#{$property}-right: em($size) !important;
#{$property}-top: em($size) !important;
#{$property}-bottom: em($size) !important;
}
// top
.#{$short}t-#{$size}-em {
#{$property}-top: em($size) !important
}
// bottom
.#{$short}b-#{$size}-em {
#{$property}-bottom: em($size) !important
}
// left
.#{$short}l-#{$size}-em {
#{$property}-left: em($size) !important
}
// right
.#{$short}r-#{$size}-em {
#{$property}-right: em($size) !important
}
// left and right
.#{$short}x-#{$size}-em {
#{$property}-left: em($size) !important;
#{$property}-right: em($size) !important;
}
// top and bottom
.#{$short}y-#{$size}-em {
#{$property}-top: em($size) !important;
#{$property}-bottom: em($size) !important;
}
// ============================= REM ========================================
// all directions
.#{$short}a-#{$size}-rem {
#{$property}-left: rem($size) !important;
#{$property}-right: rem($size) !important;
#{$property}-top: rem($size) !important;
#{$property}-bottom: rem($size) !important;
}
// top
.#{$short}t-#{$size}-rem {
#{$property}-top: rem($size) !important
}
// bottom
.#{$short}b-#{$size}-rem {
#{$property}-bottom: rem($size) !important
}
// left
.#{$short}l-#{$size}-rem {
#{$property}-left: rem($size) !important
}
// right
.#{$short}r-#{$size}-rem {
#{$property}-right: rem($size) !important
}
// left and right
.#{$short}x-#{$size}-rem {
#{$property}-left: rem($size) !important;
#{$property}-right: rem($size) !important;
}
// top and bottom
.#{$short}y-#{$size}-rem {
#{$property}-top: rem($size) !important;
#{$property}-bottom: rem($size) !important;
}
}
}
@media only screen and (min-width: 800px) { @media only screen and (min-width: 800px) {
// overflow // overflow
.v-application-md .overflow-md-auto { .v-application-md .overflow-md-auto {
@@ -366,53 +461,6 @@
align-content: stretch !important; align-content: stretch !important;
} }
@for $i from 0 through 50 {
.font-md-#{$i} {
font-size: #{$i}px;
}
}
@for $i from 0 through 10 {
$size: $i * 5;
$properties: "margin" "m", "padding" "p";
@each $property, $short in $properties {
// all directions
.#{$short}a-md-#{$size} {
#{$property}-left: #{$size}px !important;
#{$property}-right: #{$size}px !important;
#{$property}-top: #{$size}px !important;
#{$property}-bottom: #{$size}px !important;
}
// top
.#{$short}t-md-#{$size} {
#{$property}-top: #{$size}px !important;
}
// bottom
.#{$short}b-md-#{$size} {
#{$property}-bottom: #{$size}px !important;
}
// left
.#{$short}l-md-#{$size} {
#{$property}-left: #{$size}px !important;
}
// right
.#{$short}r-md-#{$size} {
#{$property}-right: #{$size}px !important;
}
// left and right
.#{$short}x-md-#{$size} {
#{$property}-left: #{$size}px !important;
#{$property}-right: #{$size}px !important;
}
// top and bottom
.#{$short}y-md-#{$size} {
#{$property}-top: #{$size}px !important;
#{$property}-bottom: #{$size}px !important;
}
}
}
.width-md-100 { .width-md-100 {
width: 100%; width: 100%;
} }
@@ -681,52 +729,6 @@
height: unset !important; height: unset !important;
} }
@for $i from 0 through 50 {
.font-lg-#{$i} {
font-size: #{$i}px;
}
}
@for $i from 0 through 10 {
$size: $i * 5;
$properties: "margin" "m", "padding" "p";
@each $property, $short in $properties {
// all directions
.#{$short}a-lg-#{$size} {
#{$property}-left: #{$size}px !important;
#{$property}-right: #{$size}px !important;
#{$property}-top: #{$size}px !important;
#{$property}-bottom: #{$size}px !important;
}
// top
.#{$short}t-lg-#{$size} {
#{$property}-top: #{$size}px !important;
}
// bottom
.#{$short}b-lg-#{$size} {
#{$property}-bottom: #{$size}px !important;
}
// left
.#{$short}l-lg-#{$size} {
#{$property}-left: #{$size}px !important;
}
// right
.#{$short}r-lg-#{$size} {
#{$property}-right: #{$size}px !important;
}
// left and right
.#{$short}x-lg-#{$size} {
#{$property}-left: #{$size}px !important;
#{$property}-right: #{$size}px !important;
}
// top and bottom
.#{$short}y-lg-#{$size} {
#{$property}-top: #{$size}px !important;
#{$property}-bottom: #{$size}px !important;
}
}
}
} }
.m-l-auto { .m-l-auto {
@@ -996,3 +998,8 @@
.cursor-pointer { .cursor-pointer {
cursor: pointer; cursor: pointer;
} }
.dnone {
display: none;
}
src/theme/variables.scss
+6 -5
View File
@@ -1,6 +1,7 @@
// Custom Theming for Angular Material // Custom Theming for Angular Material
// For more information: https://material.angular.io/guide/theming // For more information: https://material.angular.io/guide/theming
@import "~@angular/material/theming"; @import "~@angular/material/theming";
@import '~src/function.scss';
// Plus imports for other components in your app. // Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only // Include the common styles for Angular Material. We include this here so that you only
@@ -488,7 +489,7 @@ $app-theme: mat-light-theme(
} }
.approve-event-time p { .approve-event-time p {
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13) ;
font-weight: normal; font-weight: normal;
font-stretch: normal; font-stretch: normal;
font-style: normal; font-style: normal;
@@ -505,7 +506,7 @@ $app-theme: mat-light-theme(
.approve-event-detail p { .approve-event-detail p {
width: 250px; width: 250px;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: rem(13);
font-weight: normal; font-weight: normal;
font-stretch: normal; font-stretch: normal;
font-style: normal; font-style: normal;
@@ -518,7 +519,7 @@ $app-theme: mat-light-theme(
.approve-event-detail h3 { .approve-event-detail h3 {
width: 250px; width: 250px;
font-family: Roboto; font-family: Roboto;
font-size: 15px; font-size: rem(15);
font-weight: bold; font-weight: bold;
font-stretch: normal; font-stretch: normal;
font-style: normal; font-style: normal;
@@ -530,7 +531,7 @@ $app-theme: mat-light-theme(
} }
.nav-icon { .nav-icon {
font-size: 40px; font-size: rem(40);
} }
.btn-div { .btn-div {
@@ -644,7 +645,7 @@ $app-theme: mat-light-theme(
.label { .label {
border-radius: 20px; border-radius: 20px;
background: #ffb703; background: #ffb703;
font-size: 12px; font-size: rem(12);
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: #fff;
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "bde8a32f4", "shortSHA": "89e11c6fe",
"SHA": "bde8a32f4d1e0f7720c6db9e546d084e1f6e4c08", "SHA": "89e11c6fe47a65bfe2c3975c3558023a8de784a3",
"branch": "developer", "branch": "feature/mobile-viewport",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Jun 30 10:44:41 2023 +0100'", "lastCommitTime": "'Fri Jun 30 10:49:33 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "merge",
"lastCommitNumber": "5023", "lastCommitNumber": "5035",
"change": "", "change": "",
"changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/suport/oapr.ts\n\tnew file: src/firebase-config.ts\n\tmodified: version/git-version.ts", "changeStatus": "On branch feature/mobile-viewport\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/domain/process/DispatchDomain.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.scss\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.scss\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.scss\n\tmodified: src/app/pages/chat/edit-group/edit-group.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/chat/new-group/contacts/contacts.page.scss\n\tmodified: src/app/pages/chat/new-group/new-group.page.scss\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail-routing.module.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.module.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.html\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.scss\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.spec.ts\n\tdeleted: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.scss\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.scss\n\tmodified: src/app/services/theme.service.ts\n\tmodified: src/app/services/toast.service.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.scss\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.scss\n\tmodified: src/environments/suport/oapr.ts\n\tmodified: src/function.scss\n\tmodified: src/global.scss\n\tmodified: src/style/main.scss\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts\n\tnew file: web.config",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }
web.config
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="AngularRewrite" stopProcessing="true">
<match url=".*" />
<conditions logicalGrouping="MatchAll">
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
</conditions>
<action type="Rewrite" url="/" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>