From 688b2f2e324cb625b6421c1e52277786c6e87050 Mon Sep 17 00:00:00 2001 From: Soumya Prasad Rana Date: Mon, 17 Jul 2023 12:55:12 +0530 Subject: [PATCH] Cosmatic Fixes --- .../team-stats/team-stats.component.html | 7 ++- .../dynamicobjects-home.component.ts | 2 + .../home/home-page/home-page.component.ts | 3 +- src/app/public/themes/blue.scss | 2 +- src/app/public/themes/default.scss | 2 +- src/app/public/themes/mui.scss | 17 ++++-- src/app/public/themes/muiblue.scss | 8 +-- src/app/public/themes/muidark.scss | 8 +-- src/app/public/themes/muipink.scss | 8 +-- .../alert-dialog/additional-data-dialog.html | 8 +-- .../alert-dialog/additional-data-dialog.scss | 53 +++++++++--------- .../comment-dialog.component.html | 13 +++-- .../comment-dialog.component.scss | 54 ++++++++++--------- .../alert-dialog/comment-dialog.component.ts | 51 +++++++++++------- .../ltb-button-input-dialog.component.html | 29 +++++++++- .../widget/footer/footer.component.html | 2 +- .../widget/nav/side-nav/side-nav.component.ts | 8 +-- .../widget/nav/top-nav/top-nav.component.html | 2 +- src/app/public/widget/path/ip.component.ts | 1 + src/index.html | 4 +- src/styles.scss | 19 +++++-- 21 files changed, 185 insertions(+), 116 deletions(-) diff --git a/src/app/public/admin/team-stats/team-stats.component.html b/src/app/public/admin/team-stats/team-stats.component.html index c48856b..dac7435 100644 --- a/src/app/public/admin/team-stats/team-stats.component.html +++ b/src/app/public/admin/team-stats/team-stats.component.html @@ -14,7 +14,7 @@

- +
@@ -32,11 +32,10 @@

Action - - + - + diff --git a/src/app/public/dynamicobjects/dynamicobjects-home/dynamicobjects-home.component.ts b/src/app/public/dynamicobjects/dynamicobjects-home/dynamicobjects-home.component.ts index 8360456..b664287 100644 --- a/src/app/public/dynamicobjects/dynamicobjects-home/dynamicobjects-home.component.ts +++ b/src/app/public/dynamicobjects/dynamicobjects-home/dynamicobjects-home.component.ts @@ -41,6 +41,7 @@ export class DynamicobjectsHomeComponent implements OnInit { private router: Router, private route: ActivatedRoute ) { + this.spinner.setSpinnerState(true); this.loggedUser = _auth.getUser(); var promise = this.dos.getDynamicObjects(); var headers = new HttpHeaders({ @@ -83,6 +84,7 @@ export class DynamicobjectsHomeComponent implements OnInit { } } this.isLoaded = true; + this.spinner.setSpinnerState(false); }) .catch((err: any) => { this.spinner.setSpinnerState(false); diff --git a/src/app/public/home/home-page/home-page.component.ts b/src/app/public/home/home-page/home-page.component.ts index 03a9bbd..eec9f19 100644 --- a/src/app/public/home/home-page/home-page.component.ts +++ b/src/app/public/home/home-page/home-page.component.ts @@ -1041,7 +1041,7 @@ export class HomePageComponent implements OnInit { data: data, panelClass: "app-dialog-class", - width: this.loggedUser.enableRichTextForVMComment ? "1000px" : "300px", + width: this.loggedUser.enableRichTextForVMComment ? "600px" : "300px", }) .afterClosed() .toPromise() @@ -2385,6 +2385,7 @@ export class HomePageComponent implements OnInit { : "warnSnapshot"}'>${dataContext.ip}`, type: "warn", uiprop: this.properties, + angularGrid: this.angularGrid, }); } else if (dataContext.snap_count > this.properties.alertSnapshot) { Object.assign(componentOutput.componentRef.instance, { diff --git a/src/app/public/themes/blue.scss b/src/app/public/themes/blue.scss index 4944196..f576e31 100644 --- a/src/app/public/themes/blue.scss +++ b/src/app/public/themes/blue.scss @@ -811,7 +811,7 @@ mat-nav-list a { flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/themes/default.scss b/src/app/public/themes/default.scss index 66fce9c..2035ae5 100644 --- a/src/app/public/themes/default.scss +++ b/src/app/public/themes/default.scss @@ -826,7 +826,7 @@ mat-nav-list a { flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/themes/mui.scss b/src/app/public/themes/mui.scss index aafd744..fa371bb 100644 --- a/src/app/public/themes/mui.scss +++ b/src/app/public/themes/mui.scss @@ -183,9 +183,9 @@ $form-control-focus-box-shadow: $custom-alert-background; border: none !important; } .slickgrid-container .slick-header-columns .slick-column-name { - font-size: 12px !important; - font-weight: lighter !important; - background-color: var(--mui-btn-grey-background-color); + font-size: 13px !important; + background-color: var(--mui-btn-primary-background-color); + color: var(--mui-btn-primary-text-color); border-radius: 8px !important; } .slickgrid-container .slick-header-columns .slick-header-menu-button { @@ -414,7 +414,14 @@ $form-control-focus-box-shadow: $custom-alert-background; border-radius: 8px; span { h1 { - color: var(--mui-text-color) !important; + background-image: linear-gradient( + to right, + var(--mui-text-color), + var(--mui-btn-secondary-text-color) + ); + -webkit-background-clip: text; /* Clip the text to the background gradient for Safari/WebKit browsers */ + background-clip: text; /* Clip the text to the background gradient */ + color: transparent !important; /* Make the text transparent */ } } } @@ -433,7 +440,7 @@ $form-control-focus-box-shadow: $custom-alert-background; flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/themes/muiblue.scss b/src/app/public/themes/muiblue.scss index 78612d6..7a06102 100644 --- a/src/app/public/themes/muiblue.scss +++ b/src/app/public/themes/muiblue.scss @@ -151,9 +151,9 @@ $slick-row-selected-color: #a8d5f35d; border: none !important; } .slickgrid-container .slick-header-columns .slick-column-name { - font-size: 12px !important; - font-weight: lighter !important; - background-color: var(--mui-btn-grey-background-color); + font-size: 13px !important; + background-color: var(--mui-btn-primary-background-color); + color: var(--mui-btn-primary-text-color); border-radius: 8px !important; } .slickgrid-container .slick-header-columns .slick-header-menu-button { @@ -401,7 +401,7 @@ $slick-row-selected-color: #a8d5f35d; flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/themes/muidark.scss b/src/app/public/themes/muidark.scss index 854f66b..2007e11 100644 --- a/src/app/public/themes/muidark.scss +++ b/src/app/public/themes/muidark.scss @@ -151,9 +151,9 @@ $slick-row-selected-color: #9ea7aa; border: none !important; } .slickgrid-container .slick-header-columns .slick-column-name { - font-size: 12px !important; - font-weight: lighter !important; - background-color: var(--mui-btn-grey-background-color); + font-size: 13px !important; + background-color: var(--mui-btn-primary-background-color); + color: var(--mui-btn-primary-text-color); border-radius: 8px !important; } .slickgrid-container .slick-header-columns .slick-header-menu-button { @@ -401,7 +401,7 @@ $slick-row-selected-color: #9ea7aa; flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/themes/muipink.scss b/src/app/public/themes/muipink.scss index a003f62..a51513d 100644 --- a/src/app/public/themes/muipink.scss +++ b/src/app/public/themes/muipink.scss @@ -151,9 +151,9 @@ $slick-row-selected-color: #c9b2ba; border: none !important; } .slickgrid-container .slick-header-columns .slick-column-name { - font-size: 12px !important; - font-weight: lighter !important; - background-color: var(--mui-btn-grey-background-color); + font-size: 13px !important; + background-color: var(--mui-btn-primary-background-color); + color: var(--mui-btn-primary-text-color); border-radius: 8px !important; } .slickgrid-container .slick-header-columns .slick-header-menu-button { @@ -401,7 +401,7 @@ $slick-row-selected-color: #c9b2ba; flex: 0 0 auto; } #login-form-content-container { - z-index: 9999; + z-index: 1; form { button { font-weight: bolder; diff --git a/src/app/public/widget/alert-dialog/additional-data-dialog.html b/src/app/public/widget/alert-dialog/additional-data-dialog.html index 0059a92..979504a 100644 --- a/src/app/public/widget/alert-dialog/additional-data-dialog.html +++ b/src/app/public/widget/alert-dialog/additional-data-dialog.html @@ -17,7 +17,7 @@

- +
Field is required
@@ -29,7 +29,7 @@

- +
{{item.name}} is required
@@ -58,8 +58,8 @@

- - + +
Field is required
diff --git a/src/app/public/widget/alert-dialog/additional-data-dialog.scss b/src/app/public/widget/alert-dialog/additional-data-dialog.scss index 9fa13c2..afaadb6 100644 --- a/src/app/public/widget/alert-dialog/additional-data-dialog.scss +++ b/src/app/public/widget/alert-dialog/additional-data-dialog.scss @@ -1,48 +1,49 @@ .snapDialog { - padding: 20px; - margin: 30px; + padding: 20px; + margin: 30px; } .adtnal-data-view { - width: 600px; + width: 600px; + overflow-x: hidden; } .titleBar { - float: right; - margin-top: 3px; - width: 100%; - text-align: end; - background: #a5a5a5; - padding-right: 3px; + float: right; + margin-top: 3px; + width: 100%; + text-align: end; + background: #a5a5a5; + padding-right: 3px; } .titleicon { - margin-left: 5px; + margin-left: 5px; } .alertMssg { - color: #000; - font-size: 13px; - width: 100%; - margin-top: 20px; - height: 80%; + color: #000; + font-size: 13px; + width: 100%; + margin-top: 20px; + height: 80%; } .ngx-select__choices { - z-index: 9999; + z-index: 9999; } ::ng-deep .app-dialog-class { - mat-dialog-container { - padding-top: 10px !important; - padding-left: 10px !important; - padding-right: 10px !important; - overflow: hidden; - } + mat-dialog-container { + padding-top: 10px !important; + padding-left: 10px !important; + padding-right: 10px !important; + overflow: hidden; + } } .float-end { - float: inline-end !important; - /*fallback for chrome*/ - float: right !important; -} \ No newline at end of file + float: inline-end !important; + /*fallback for chrome*/ + float: right !important; +} diff --git a/src/app/public/widget/alert-dialog/comment-dialog.component.html b/src/app/public/widget/alert-dialog/comment-dialog.component.html index be49b79..69056c6 100644 --- a/src/app/public/widget/alert-dialog/comment-dialog.component.html +++ b/src/app/public/widget/alert-dialog/comment-dialog.component.html @@ -7,19 +7,22 @@

-
{{data.label}} +
-
- +
+ - + +
+
{{data.label}} is required
+
-
+
diff --git a/src/app/public/widget/alert-dialog/comment-dialog.component.scss b/src/app/public/widget/alert-dialog/comment-dialog.component.scss index 6dd3595..54407e9 100644 --- a/src/app/public/widget/alert-dialog/comment-dialog.component.scss +++ b/src/app/public/widget/alert-dialog/comment-dialog.component.scss @@ -1,44 +1,48 @@ .snapDialog { - padding: 20px; - margin: 30px; + padding: 20px; + margin: 30px; } .titleBar { - float: right; - margin-top: 3px; - width: 100%; - text-align: end; - background: #a5a5a5; - padding-right: 3px; + float: right; + margin-top: 3px; + width: 100%; + text-align: end; + background: #a5a5a5; + padding-right: 3px; } .titleicon { - margin-left: 5px; + margin-left: 5px; } .alertMssg { - color: #000; - font-size: 13px; - width: 100%; - margin-top: 20px; - height: 80%; + color: #000; + font-size: 13px; + width: 100%; + margin-top: 20px; + height: 80%; } .ngx-select__choices { - z-index: 9999; + z-index: 9999; } ::ng-deep .app-dialog-class { - mat-dialog-container { - padding-top: 10px !important; - padding-left: 10px !important; - padding-right: 10px !important; - overflow: visible; - } + mat-dialog-container { + padding-top: 10px !important; + padding-left: 10px !important; + padding-right: 10px !important; + overflow: visible; + } } .float-end { - float: inline-end !important; - /*fallback for chrome*/ - float: right !important; -} \ No newline at end of file + float: inline-end !important; + /*fallback for chrome*/ + float: right !important; +} + +.quill-editor-is-invalid ~ .invalid-feedback { + display: block; +} diff --git a/src/app/public/widget/alert-dialog/comment-dialog.component.ts b/src/app/public/widget/alert-dialog/comment-dialog.component.ts index b929129..5417a7a 100644 --- a/src/app/public/widget/alert-dialog/comment-dialog.component.ts +++ b/src/app/public/widget/alert-dialog/comment-dialog.component.ts @@ -9,20 +9,20 @@ * @modify date 2022-04-19 18:26:41 * @desc Input Dialog Component */ -import { Component, Inject, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from "@angular/core"; import { FormGroup, FormBuilder, Validators, FormControl, -} from '@angular/forms'; +} from "@angular/forms"; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA, -} from '@angular/material/dialog'; -import { NgSelectConfig } from '@ng-select/ng-select'; -import { AuthserviceService } from '../../services/authservice.service'; +} from "@angular/material/dialog"; +import { NgSelectConfig } from "@ng-select/ng-select"; +import { AuthserviceService } from "../../services/authservice.service"; export interface DialogData { type?: string; @@ -33,41 +33,56 @@ export interface DialogData { title?: string; placeholder?: string; bindLabel?: string; - bindValue?:string; + bindValue?: string; isText?: boolean; titleIcon?: boolean; defaultValue?: string; closeCallback?: any; } @Component({ - selector: 'app-comment-dialog', - templateUrl: './comment-dialog.component.html', - styleUrls: ['./comment-dialog.component.scss'], + selector: "app-comment-dialog", + templateUrl: "./comment-dialog.component.html", + styleUrls: [ "./comment-dialog.component.scss" ], }) export class CommentDialogComponent implements OnInit { registerForm!: FormGroup; submitted = false; public dataCtrl = new FormControl(); - loggedUser:any; - formGroupheight:any='50px' + loggedUser: any; + formGroupheight: any = "50px"; + quillConf: any; constructor( @Inject(MAT_DIALOG_DATA) public data: DialogData, private dialogRef: MatDialogRef, private formBuilder: FormBuilder, private config: NgSelectConfig, - private auth:AuthserviceService + private auth: AuthserviceService ) { - this.config.appendTo = 'body'; - this.loggedUser=auth.getUser(); - if(this.loggedUser.enableRichTextForVMComment) - this.formGroupheight='200px'; + this.config.appendTo = "body"; + this.loggedUser = auth.getUser(); + if (this.loggedUser.enableRichTextForVMComment) { + this.formGroupheight = "200px"; + { + this.quillConf = { + toolbar: [ + [ "bold", "italic", "underline", "strike" ], + [ "blockquote", "code-block" ], + [ { list: "ordered" }, { list: "bullet" } ], + [ { header: [ 1, 2, 3, 4, 5, 6, false ] } ], + [ { color: [] }, { background: [] } ], + [ "link" ], + [ "clean" ], + ], + }; + } + } } ngOnInit(): void { var defaultV = null; if (this.data.defaultValue) defaultV = this.data.defaultValue; this.registerForm = this.formBuilder.group({ - dataCtrl: [defaultV, Validators.required], + dataCtrl: [ defaultV, Validators.required ], }); } get f() { @@ -86,7 +101,7 @@ export class CommentDialogComponent implements OnInit { this.dialogRef.close(); if ( this.data.closeCallback && - typeof this.data.closeCallback == 'function' + typeof this.data.closeCallback == "function" ) { this.data.closeCallback(); } diff --git a/src/app/public/widget/alert-dialog/ltb-button-input-dialog.component.html b/src/app/public/widget/alert-dialog/ltb-button-input-dialog.component.html index 541a492..ebe5c66 100644 --- a/src/app/public/widget/alert-dialog/ltb-button-input-dialog.component.html +++ b/src/app/public/widget/alert-dialog/ltb-button-input-dialog.component.html @@ -6,7 +6,7 @@


- + + +
+
+
+
+ + +
+
Field is required
+
+
+
+
+
+
+ + + + +
+
+
+ + \ No newline at end of file diff --git a/src/app/public/widget/footer/footer.component.html b/src/app/public/widget/footer/footer.component.html index a301275..adac0e2 100644 --- a/src/app/public/widget/footer/footer.component.html +++ b/src/app/public/widget/footer/footer.component.html @@ -2,6 +2,6 @@

- VM Assignment Portal 2.0.9 © 2023 All rights reserved. + VM Assignment Portal 2.1.0 © 2023 All rights reserved.

diff --git a/src/app/public/widget/nav/side-nav/side-nav.component.ts b/src/app/public/widget/nav/side-nav/side-nav.component.ts index c3ef9c0..d0ab207 100644 --- a/src/app/public/widget/nav/side-nav/side-nav.component.ts +++ b/src/app/public/widget/nav/side-nav/side-nav.component.ts @@ -137,11 +137,11 @@ export class SideNavComponent implements OnInit { } versionInfo(){ this.openAlertDialog({type:"info",message:`
-

Version: 2.0.9

-

Build Number: 209-15072023

-

Build Date: July 15, 2023

+

Version: 2.1.0

+

Build Number: 210-17072023

+

Build Date: July 17, 2023

- VM Assignment Portal 2.0.9 © 2023 All rights reserved.

+ VM Assignment Portal 2.1.0 © 2023 All rights reserved.

Made with ❤ by Soumya

`}); diff --git a/src/app/public/widget/nav/top-nav/top-nav.component.html b/src/app/public/widget/nav/top-nav/top-nav.component.html index 6e85ef4..c72d841 100644 --- a/src/app/public/widget/nav/top-nav/top-nav.component.html +++ b/src/app/public/widget/nav/top-nav/top-nav.component.html @@ -1,6 +1,6 @@

VM Assignment Portal

diff --git a/src/app/public/widget/path/ip.component.ts b/src/app/public/widget/path/ip.component.ts index 516b559..820cc47 100644 --- a/src/app/public/widget/path/ip.component.ts +++ b/src/app/public/widget/path/ip.component.ts @@ -60,6 +60,7 @@ export class IPComponent implements OnInit { @Input() functionParameter2: any = null; @Input() functionParameter3: any = null; @Input() uiprop: any = null; + @Input() angularGrid: any = null; constructor(private router: Router) {} ngOnInit(): void {} diff --git a/src/index.html b/src/index.html index 1f20f80..a1e2358 100644 --- a/src/index.html +++ b/src/index.html @@ -12,8 +12,8 @@ --> - - + diff --git a/src/styles.scss b/src/styles.scss index ff5cf08..b016344 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -77,17 +77,19 @@ mat-dialog-container button[type=button] { /* App Font Styles*/ .slickgrid-container .grid-canvas .slick-row { - font-family: var(--bs-font-sans-serif) !important; + font-family: Arial !important; + font-weight: var(--slick-cell-font-weight, 450) !important; } .slickgrid-container .slick-header-columns .slick-column-name { - font-family: var(--bs-font-sans-serif) !important; + font-family: Arial !important; + font-weight: var(--slick-cell-font-weight, 501) !important; } .mat-list-item { - font-family: var(--bs-font-sans-serif) !important; + font-family: Arial !important; } body { - font-family: var(--bs-font-sans-serif) !important; + font-family: Arial !important; } .mat-menu-item { font-family: var(--bs-font-sans-serif) !important; @@ -95,3 +97,12 @@ body { mat-nav-list a :hover { font-weight: unset !important; } +.form-group label { + font-weight: bold !important; +} +.quill-editor-is-invalid .ql-container { + border-color: red !important; +} +.quill-editor-is-invalid .ql-toolbar { + border-color: red !important; +}