This commit is contained in:
parent
35844e0cf1
commit
31c90f3190
|
@ -13,10 +13,15 @@ import { InfoModal } from './models/InfoModal'
|
||||||
import { DcAdapterSettings } from './models/DcAdapterSettings'
|
import { DcAdapterSettings } from './models/DcAdapterSettings'
|
||||||
import { AppStoreService } from './services/app-store.service'
|
import { AppStoreService } from './services/app-store.service'
|
||||||
import { LicenceService } from './services/licence.service'
|
import { LicenceService } from './services/licence.service'
|
||||||
import '@cds/core/icon/register.js';
|
import '@cds/core/icon/register.js'
|
||||||
import { ClarityIcons, exclamationTriangleIcon, moonIcon, sunIcon } from '@cds/core/icon';
|
import {
|
||||||
|
ClarityIcons,
|
||||||
|
exclamationTriangleIcon,
|
||||||
|
moonIcon,
|
||||||
|
sunIcon
|
||||||
|
} from '@cds/core/icon'
|
||||||
|
|
||||||
ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon);
|
ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon)
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'my-app',
|
selector: 'my-app',
|
||||||
|
|
|
@ -169,7 +169,10 @@
|
||||||
<clr-icon shape="caret" dir="left" size="20"></clr-icon>
|
<clr-icon shape="caret" dir="left" size="20"></clr-icon>
|
||||||
Back to table selection
|
Back to table selection
|
||||||
</span>
|
</span>
|
||||||
<span (click)="viewboxManager()" class="btn btn-sm btn-icon btn-dimmed viewbox-open">
|
<span
|
||||||
|
(click)="viewboxManager()"
|
||||||
|
class="btn btn-sm btn-icon btn-dimmed viewbox-open"
|
||||||
|
>
|
||||||
<clr-icon shape="view-cards" size="20"></clr-icon>
|
<clr-icon shape="view-cards" size="20"></clr-icon>
|
||||||
Viewboxes
|
Viewboxes
|
||||||
</span>
|
</span>
|
||||||
|
@ -488,7 +491,9 @@
|
||||||
>
|
>
|
||||||
<div *ngIf="tableTrue" class="clr-offset-md-2 clr-col-md-8">
|
<div *ngIf="tableTrue" class="clr-offset-md-2 clr-col-md-8">
|
||||||
<div class="text-area-full-width">
|
<div class="text-area-full-width">
|
||||||
<label for="formFields_8" class="mb-5 d-block">Message</label>
|
<label for="formFields_8" class="mb-5 d-block"
|
||||||
|
>Message</label
|
||||||
|
>
|
||||||
<textarea
|
<textarea
|
||||||
clrTextarea
|
clrTextarea
|
||||||
[(ngModel)]="message"
|
[(ngModel)]="message"
|
||||||
|
|
|
@ -70,4 +70,4 @@ const addDarkClass = (td: any) => {
|
||||||
if (!td.classList.contains('htDark')) {
|
if (!td.classList.contains('htDark')) {
|
||||||
td.classList.add('htDark')
|
td.classList.add('htDark')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,10 +128,18 @@
|
||||||
size="60"
|
size="60"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<p *ngIf="treeNodeLibraries?.length! > 0" class="text-center color-gray mt-10" cds-text="section">
|
<p
|
||||||
|
*ngIf="treeNodeLibraries?.length! > 0"
|
||||||
|
class="text-center color-gray mt-10"
|
||||||
|
cds-text="section"
|
||||||
|
>
|
||||||
Please select a table
|
Please select a table
|
||||||
</p>
|
</p>
|
||||||
<p *ngIf="treeNodeLibraries?.length! < 1" class="text-center color-gray mt-10" cds-text="section">
|
<p
|
||||||
|
*ngIf="treeNodeLibraries?.length! < 1"
|
||||||
|
class="text-center color-gray mt-10"
|
||||||
|
cds-text="section"
|
||||||
|
>
|
||||||
No Editable Tables Configured
|
No Editable Tables Configured
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -141,7 +141,9 @@
|
||||||
size="60"
|
size="60"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<p class="text-center color-gray mt-10" cds-text="section">Please select a column or table</p>
|
<p class="text-center color-gray mt-10" cds-text="section">
|
||||||
|
Please select a column or table
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ng-container *ngIf="column || table">
|
<ng-container *ngIf="column || table">
|
||||||
|
|
|
@ -73,7 +73,9 @@
|
||||||
size="60"
|
size="60"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<p class="text-center color-gray mt-10" cds-text="section">Please select a type</p>
|
<p class="text-center color-gray mt-10" cds-text="section">
|
||||||
|
Please select a type
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="loadingSpinner" *ngIf="loading">
|
<div class="loadingSpinner" *ngIf="loading">
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
export interface AppSettings {
|
export interface AppSettings {
|
||||||
persistSelectedTheme: boolean,
|
persistSelectedTheme: boolean
|
||||||
selectedTheme: AppThemes
|
selectedTheme: AppThemes
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum AppThemes {
|
export enum AppThemes {
|
||||||
light = 'light',
|
light = 'light',
|
||||||
dark = 'dark'
|
dark = 'dark'
|
||||||
}
|
}
|
||||||
|
|
|
@ -284,9 +284,7 @@
|
||||||
>
|
>
|
||||||
<span class="label label-warning">
|
<span class="label label-warning">
|
||||||
Changed Rows
|
Changed Rows
|
||||||
<span class="badge">{{
|
<span class="badge">{{ lens.updated }}</span>
|
||||||
lens.updated
|
|
||||||
}}</span>
|
|
||||||
</span>
|
</span>
|
||||||
<span class="label label-success">
|
<span class="label label-success">
|
||||||
Added Rows
|
Added Rows
|
||||||
|
@ -294,9 +292,7 @@
|
||||||
</span>
|
</span>
|
||||||
<span class="label label-danger">
|
<span class="label label-danger">
|
||||||
Deleted Rows
|
Deleted Rows
|
||||||
<span class="badge">{{
|
<span class="badge">{{ lens.deleted }}</span>
|
||||||
lens.deleted
|
|
||||||
}}</span>
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -101,8 +101,11 @@
|
||||||
|
|
||||||
<clr-dg-footer>
|
<clr-dg-footer>
|
||||||
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
||||||
<clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]">Items per page</clr-dg-page-size>
|
<clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
|
||||||
{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ pagination.totalItems }} approvals
|
>Items per page</clr-dg-page-size
|
||||||
|
>
|
||||||
|
{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of
|
||||||
|
{{ pagination.totalItems }} approvals
|
||||||
</clr-dg-pagination>
|
</clr-dg-pagination>
|
||||||
</clr-dg-footer>
|
</clr-dg-footer>
|
||||||
</clr-datagrid>
|
</clr-datagrid>
|
||||||
|
|
|
@ -88,8 +88,12 @@
|
||||||
|
|
||||||
<clr-dg-footer>
|
<clr-dg-footer>
|
||||||
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
||||||
<clr-dg-page-size [clrPageSizeOptions]="[3 ,5 ,10, 15]">Items per page</clr-dg-page-size>
|
<clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
|
||||||
{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ pagination.totalItems }} submissions
|
>Items per page</clr-dg-page-size
|
||||||
|
>
|
||||||
|
{{ pagination.firstItem + 1 }} -
|
||||||
|
{{ pagination.lastItem + 1 }} of
|
||||||
|
{{ pagination.totalItems }} submissions
|
||||||
</clr-dg-pagination>
|
</clr-dg-pagination>
|
||||||
</clr-dg-footer>
|
</clr-dg-footer>
|
||||||
</clr-datagrid>
|
</clr-datagrid>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { BehaviorSubject } from "rxjs"
|
import { BehaviorSubject } from 'rxjs'
|
||||||
import { AppSettings, AppThemes } from "../models/AppSettings"
|
import { AppSettings, AppThemes } from '../models/AppSettings'
|
||||||
|
|
||||||
export class AppSettingsService {
|
export class AppSettingsService {
|
||||||
public defaultSettings: AppSettings = {
|
public defaultSettings: AppSettings = {
|
||||||
|
@ -24,9 +24,11 @@ export class AppSettingsService {
|
||||||
|
|
||||||
this.setAppSettings(settings)
|
this.setAppSettings(settings)
|
||||||
} else {
|
} else {
|
||||||
console.info('No app settings stored in the localStorage, we will set to default values.')
|
console.info(
|
||||||
|
'No app settings stored in the localStorage, we will set to default values.'
|
||||||
|
)
|
||||||
}
|
}
|
||||||
} catch(err) {
|
} catch (err) {
|
||||||
console.warn('Error restoring settings from local storgae.', err)
|
console.warn('Error restoring settings from local storgae.', err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -51,4 +53,4 @@ export class AppSettingsService {
|
||||||
|
|
||||||
this.storeAppSettings()
|
this.storeAppSettings()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,9 +22,7 @@ export class EventService {
|
||||||
|
|
||||||
public darkMode: BehaviorSubject<boolean> = new BehaviorSubject(false)
|
public darkMode: BehaviorSubject<boolean> = new BehaviorSubject(false)
|
||||||
|
|
||||||
constructor(
|
constructor(private appSettingsService: AppSettingsService) {}
|
||||||
private appSettingsService: AppSettingsService
|
|
||||||
) {}
|
|
||||||
|
|
||||||
toggleDarkMode(value: boolean) {
|
toggleDarkMode(value: boolean) {
|
||||||
this.darkMode.next(value)
|
this.darkMode.next(value)
|
||||||
|
|
|
@ -1,7 +1,23 @@
|
||||||
<div class="header-actions">
|
<div class="header-actions">
|
||||||
<div class="d-flex clr-align-items-center">
|
<div class="d-flex clr-align-items-center">
|
||||||
<cds-icon *ngIf="!darkMode.value" (click)="toggleDarkMode(true)" size="md" class="theme-toggle-icon cursor-pointer" shape="moon" inverse="false" solid="false"></cds-icon>
|
<cds-icon
|
||||||
<cds-icon *ngIf="!!darkMode.value" (click)="toggleDarkMode(false)" size="md" class="theme-toggle-icon cursor-pointer" shape="sun" inverse="false" solid="false"></cds-icon>
|
*ngIf="!darkMode.value"
|
||||||
|
(click)="toggleDarkMode(true)"
|
||||||
|
size="md"
|
||||||
|
class="theme-toggle-icon cursor-pointer"
|
||||||
|
shape="moon"
|
||||||
|
inverse="false"
|
||||||
|
solid="false"
|
||||||
|
></cds-icon>
|
||||||
|
<cds-icon
|
||||||
|
*ngIf="!!darkMode.value"
|
||||||
|
(click)="toggleDarkMode(false)"
|
||||||
|
size="md"
|
||||||
|
class="theme-toggle-icon cursor-pointer"
|
||||||
|
shape="sun"
|
||||||
|
inverse="false"
|
||||||
|
solid="false"
|
||||||
|
></cds-icon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<app-loading-indicator></app-loading-indicator>
|
<app-loading-indicator></app-loading-indicator>
|
||||||
|
|
|
@ -36,7 +36,7 @@ export class StageComponent implements OnInit {
|
||||||
afterGetColHeader: (column, th, headerLevel) => {
|
afterGetColHeader: (column, th, headerLevel) => {
|
||||||
// Dark mode
|
// Dark mode
|
||||||
th.classList.add('darkTH')
|
th.classList.add('darkTH')
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|
|
@ -8,11 +8,6 @@ import { FormsModule } from '@angular/forms'
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [SystemComponent],
|
declarations: [SystemComponent],
|
||||||
imports: [
|
imports: [CommonModule, SystemRoutingModule, ClarityModule, FormsModule]
|
||||||
CommonModule,
|
|
||||||
SystemRoutingModule,
|
|
||||||
ClarityModule,
|
|
||||||
FormsModule
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
export class SystemModule {}
|
export class SystemModule {}
|
||||||
|
|
|
@ -323,7 +323,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card no-borders h-100 d-flex clr-flex-column" *ngIf="!loadingTableView">
|
<div
|
||||||
|
class="card no-borders h-100 d-flex clr-flex-column"
|
||||||
|
*ngIf="!loadingTableView"
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
*ngIf="table"
|
*ngIf="table"
|
||||||
class="header-row clr-row justify-content-between clr-justify-content-center w-100 m-0"
|
class="header-row clr-row justify-content-between clr-justify-content-center w-100 m-0"
|
||||||
|
@ -482,7 +485,9 @@
|
||||||
size="60"
|
size="60"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<h3 class="text-center color-gray mt-10" cds-text="section">Please select a library</h3>
|
<h3 class="text-center color-gray mt-10" cds-text="section">
|
||||||
|
Please select a library
|
||||||
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ng-container *ngIf="!noData && !noDataReqErr && !table && lib">
|
<ng-container *ngIf="!noData && !noDataReqErr && !table && lib">
|
||||||
|
@ -520,7 +525,9 @@
|
||||||
size="40"
|
size="40"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<p class="text-center color-gray mt-10" cds-text="section">Please select a table</p>
|
<p class="text-center color-gray mt-10" cds-text="section">
|
||||||
|
Please select a table
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="libinfo !== null" class="libinfo m-0 clr-row">
|
<div *ngIf="libinfo !== null" class="libinfo m-0 clr-row">
|
||||||
|
|
|
@ -50,10 +50,18 @@
|
||||||
size="60"
|
size="60"
|
||||||
class="is-info icon-dc-fill"
|
class="is-info icon-dc-fill"
|
||||||
></clr-icon>
|
></clr-icon>
|
||||||
<p *ngIf="xlmaps.length > 0" class="text-center color-gray mt-10" cds-text="section">
|
<p
|
||||||
|
*ngIf="xlmaps.length > 0"
|
||||||
|
class="text-center color-gray mt-10"
|
||||||
|
cds-text="section"
|
||||||
|
>
|
||||||
Please select a map
|
Please select a map
|
||||||
</p>
|
</p>
|
||||||
<p *ngIf="xlmaps.length < 1" class="text-center color-gray mt-10" cds-text="section">
|
<p
|
||||||
|
*ngIf="xlmaps.length < 1"
|
||||||
|
class="text-center color-gray mt-10"
|
||||||
|
cds-text="section"
|
||||||
|
>
|
||||||
No excel map is found
|
No excel map is found
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user