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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-10-28 15:40:50 +01:00
parent bccb4ed0d5 59bf4d4d1d
commit aaab69f3af
9 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.component.ts
+9 -1
View File
@@ -8,6 +8,7 @@ import * as _rollupMoment from 'moment';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
const moment = _rollupMoment || _moment;
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -35,7 +36,8 @@ export class AppComponent {
constructor(
private platform: Platform,
/* private splashScreen: SplashScreen, */
private statusBar: StatusBar
private statusBar: StatusBar,
private screenOrientation: ScreenOrientation
) {
this.initializeApp();
}
@@ -44,6 +46,12 @@ export class AppComponent {
this.platform.ready().then(() => {
this.statusBar.styleDefault();
/* this.splashScreen.hide(); */
if (this.platform.is("tablet")) {
this.screenOrientation.unlock();
} else if( this.platform.is("mobile")) {
this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT_PRIMARY);
}
});
}
}
src/app/home/home.page.ts
+3 -1
View File
@@ -24,6 +24,7 @@ import { BackgroundService } from 'src/app/services/background.service';
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
import { Storage } from '@ionic/storage';
import { EventsService } from 'src/app/services/events.service';
import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
@Component({
@@ -84,7 +85,8 @@ export class HomePage implements OnInit {
private backgroundservice: BackgroundService,
private offlinemanager: OfflineManagerService,
private storage: Storage,
private eventservice: EventsService) {
private eventservice: EventsService,
private screenOrientation: ScreenOrientation) {
this.webNotificationPopupService.askNotificationPermission()
src/app/pages/search/search.page.html
+6 -5
View File
@@ -27,7 +27,8 @@
<ion-icon src="assets/images/icons-most-searched-words-open.svg" class="icon" slot="end"></ion-icon>
</div>
<div *ngIf="showAdvanceSearch" class="icon-z icon-most-searched-word-open align-md-baseline pl-10 cursor-pointer" (click)="showHideAdvanceSearch(false)" >
<ion-icon src="assets/images/advance-search-show-modal.svg" class="icon" slot="end"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "src="assets/images/advance-search-show-modal.svg" class="icon" slot="end"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/advance-search-show-modal.svg" class="icon" slot="end"></ion-icon>
</div>
<div class="profile">
@@ -48,8 +49,8 @@
<div class="icon-mer icon">
<ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-document.svg"></ion-icon>
</div>
<div class="input-container d-flex ion-align-items-center">
<ion-datetime [(ngModel)]='searchDocumentDate' placeholder="Data" display-timezone="utc"></ion-datetime>
<div class="input-container d-flex ion-align-items-">
<ion-datetime class="cursor-pointer" [(ngModel)]='searchDocumentDate' placeholder="Data" display-timezone="utc"></ion-datetime>
<div class="icon cursor-pointer" (click)="clearInputDocumentDate()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
@@ -62,7 +63,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-sender.svg"></ion-icon>
</div>
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSender' class="search-input" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<ion-input [(ngModel)]='searchSender' class="search-input cursor-pointer" (click)="openAdvanceSearchSelection()" type="search" placeholder="Remetentes"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputRemetente()" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
@@ -75,7 +76,7 @@
<ion-icon name="restaurant-outline" src="assets/images/icons-arrow-arrow-down-25-copy.svg"></ion-icon>
</div>
<div class="input-container d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchOrganicEntiry' class="search-input" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<ion-input [(ngModel)]='searchOrganicEntiry' class="search-input custom-checkbox" type="search" placeholder="Entidade Orgânica" (click)="openOrganicEntitySelection()"></ion-input>
<div class="icon cursor-pointer" (click)="clearInputOrganicEntity()" >
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
src/assets/icon/theme/gov/icons-chat-send.svg
+4 -4
View File
@@ -1,7 +1,7 @@
<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="#080808"/>
<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="#080808"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9 9H23V10H9V9Z" fill="white"/>
<path d="M14 12C15.1046 12 16 11.1046 16 10C16 8.89543 15.1046 8 14 8C12.8954 8 12 8.89543 12 10C12 11.1046 12.8954 12 14 12Z" fill="white"/>
<path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="#080808" stroke-width="2" stroke-linejoin="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="#080808"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M34 22L12 30L16 22L12 14L34 22Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 21H33V23H16V21Z" fill="white"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 702 B

src/assets/icon/theme/gov/icons-most-searched-words-open.svg
+7
View File
@@ -0,0 +1,7 @@
<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="white" stroke-width="2"/>
<path d="M29.857 23.857L34.357 28.357" stroke="white" stroke-width="2" stroke-linecap="round"/>
<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="white"/>
<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1016 B

src/assets/images/theme/gov/advance-search-show-modal.svg
+7
View File
@@ -0,0 +1,7 @@
<svg width="45" height="45" viewBox="0 0 45 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5 45C34.9264 45 45 34.9264 45 22.5C45 10.0736 34.9264 0 22.5 0C10.0736 0 0 10.0736 0 22.5C0 34.9264 10.0736 45 22.5 45Z" fill="#FFB81C"/>
<path d="M24.714 25.428C28.422 25.428 31.428 22.422 31.428 18.714C31.428 15.006 28.422 12 24.714 12C21.006 12 18 15.006 18 18.714C18 22.422 21.006 25.428 24.714 25.428Z" stroke="white" stroke-width="2"/>
<path d="M29.857 23.857L34.357 28.357" stroke="white" stroke-width="2" stroke-linecap="round"/>
<path d="M16.857 27.857C16.857 27.3047 16.4093 26.857 15.857 26.857C15.3047 26.857 14.857 27.3047 14.857 27.857V33.857C14.857 34.4093 15.3047 34.857 15.857 34.857C16.4093 34.857 16.857 34.4093 16.857 33.857V27.857Z" fill="white"/>
<path d="M18.857 29.857H12.857C12.3047 29.857 11.857 30.3047 11.857 30.857C11.857 31.4093 12.3047 31.857 12.857 31.857H18.857C19.4093 31.857 19.857 31.4093 19.857 30.857C19.857 30.3047 19.4093 29.857 18.857 29.857Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1016 B

src/assets/www/pdfjs/web/viewer.html
+1 -1
View File
@@ -35,7 +35,7 @@
console.log(event)
if (event.data && event.data.sender == "cookies") {
// setCookie()
}
});
src/theme/variables.scss
+2 -4
View File
@@ -714,7 +714,7 @@ body {
--login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important;
--button-hover: #c63527;
--button-color: #ffb81c;
--button-text-color: #000;
--button-text-color: white;
--inicio-open-page-from-box: #c63527;
--header-tab-top-border: #000;
@@ -780,8 +780,6 @@ body {
}
}
.default {
--ion-color-primary: #3880ff;
--ion-color-secondary: #e4e8eb75;
@@ -789,7 +787,7 @@ body {
--button-hover: #42b9fe;
--inicio-open-page-from-box: #42b9fe;
--button-color: #e0e9ee;
--button-text-color: #white;
--button-text-color: white;
--header-tab-top-border: white;
--header-tab-text-white: white;
--mat-selected: #87cefa;