Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cosmatic Fixes #81

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Cosmatic Fixes #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/app/public/admin/team-stats/team-stats.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h3 class="page-title ms-3">
<tr *ngFor="let users of list|groupBy:'user_team' |toArray">
<td>

<label style="margin-top:5px;"><span class="badge app-badge">Team: </span> {{ users[0].user_team }}</label>
<label style="margin-top:5px;cursor:pointer;" (click)="temp[users[0].user_team]=!temp[users[0].user_team]"><span class="badge app-badge">Team: </span> {{ users[0].user_team }}</label>
<div style="float: right; margin-right: 10px;cursor:pointer;">
<div style="float:right;padding:5px;" *ngIf="!temp[users[0].user_team]" (click)="temp[users[0].user_team]=!temp[users[0].user_team]">
<i class="arrowX downX"></i>
Expand All @@ -32,11 +32,10 @@ <h3 class="page-title ms-3">
<th>Action</th>
<tr *ngFor="let user of users | orderBy: 'user_name' ">
<td style="text-align:left; ">

<i class="fa fa-user "></i> <label style="margin-left:5px;font-weight: 100; ">{{ user.user_id }}</label>
<i class="fa fa-user "></i> <label style="margin-left:5px;font-weight: 500; ">{{ user.user_id }}</label>
</td>
<td style="text-align:left; ">
<label [matTooltip]="user.user_name" style="overflow:hidden;white-space:nowrap; text-overflow: ellipsis;font-weight: 100; ">{{ user.user_name }}</label>
<label [matTooltip]="user.user_name" style="overflow:hidden;white-space:nowrap; text-overflow: ellipsis;font-weight: 500; ">{{ user.user_name }}</label>
</td>
<td>
<span *ngIf="user.is_teamLead=='1' "><i class="fa fa-check-circle "></i></span>
Expand Down
2 changes: 2 additions & 0 deletions src/app/public/dynamicobjects/dynamicobjects-home/dynamicobjects-home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -83,6 +84,7 @@ export class DynamicobjectsHomeComponent implements OnInit {
}
}
this.isLoaded = true;
this.spinner.setSpinnerState(false);
})
.catch((err: any) => {
this.spinner.setSpinnerState(false);
Expand Down
3 changes: 2 additions & 1 deletion src/app/public/home/home-page/home-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -2385,6 +2385,7 @@ export class HomePageComponent implements OnInit {
: "warnSnapshot"}'>${dataContext.ip}</span>`,
type: "warn",
uiprop: this.properties,
angularGrid: this.angularGrid,
});
} else if (dataContext.snap_count > this.properties.alertSnapshot) {
Object.assign(componentOutput.componentRef.instance, {
Expand Down
2 changes: 1 addition & 1 deletion src/app/public/themes/blue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/public/themes/default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 12 additions & 5 deletions src/app/public/themes/mui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 */
}
}
}
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/app/public/themes/muiblue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/app/public/themes/muidark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/app/public/themes/muipink.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/app/public/widget/alert-dialog/additional-data-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 mat-dialog-title class="dialog-title">
<div class="col ">
<div class="form-group required">

<label for="field_{{i}}">Field name: {{getFormCotrolData('field_'+i)}}</label>
<label class="bold" for="field_{{i}}">Field name: {{getFormCotrolData('field_'+i)}}</label>
<input maxlength="31" id="field_{{i}}" class="form-control" formControlName="field_{{i}}" [ngClass]="{ 'is-invalid': submitted && checkIsInvalid('field_'+i) }">
<div *ngIf="submitted && checkIsInvalid('field_'+i)" class="invalid-feedback">
<div class="ms-1" *ngIf="checkIsInvalidRequired('field_'+i)">Field is required</div>
Expand All @@ -29,7 +29,7 @@ <h1 mat-dialog-title class="dialog-title">
<div class="col ">
<div class="form-group required">

<label for="field_{{i}}_value">Value for field {{getFormCotrolData('field_'+i)}} </label>
<label class="bold" for="field_{{i}}_value">Value for field {{getFormCotrolData('field_'+i)}} </label>
<input id="field_{{i}}_value" class="form-control" formControlName="field_{{i}}_value" [ngClass]="{ 'is-invalid': submitted && checkIsInvalid('field_'+i+'_value') }">
<div *ngIf="submitted && checkIsInvalid('field_'+i+'_value')" class="invalid-feedback">
<div class="ms-1" *ngIf="checkIsInvalidRequired('field_'+i+'_value')">{{item.name}} is required</div>
Expand Down Expand Up @@ -58,8 +58,8 @@ <h1 mat-dialog-title class="dialog-title">
<div class="col ">
<div *ngFor="let item of data.list" class="form-group required">

<label for="{{item.name}}">{{item.name}}</label>
<input id="{{item.name}}" class="form-control" formControlName="{{item.name}}" [ngClass]="{ 'is-invalid': submitted && checkIsInvalid(item.name) }">
<label class="bold" for="{{item.name}}">{{item.name}}</label>
<input id="{{item.name}}" class="form-control" formControlName="{{item.name}}" [ngClass]="{ 'is-invalid': submitted && checkIsInvalid(item.name) }" disabled>
<div *ngIf="submitted && checkIsInvalid(item.name)" class="invalid-feedback">
<div class="ms-1" *ngIf="checkIsInvalidRequired(item.name)">Field is required</div>
</div>
Expand Down
53 changes: 27 additions & 26 deletions src/app/public/widget/alert-dialog/additional-data-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
float: inline-end !important;
/*fallback for chrome*/
float: right !important;
}
13 changes: 8 additions & 5 deletions src/app/public/widget/alert-dialog/comment-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,22 @@ <h1 mat-dialog-title class="dialog-title">
</span>
</h1>
<mat-dialog-content class="alertMssg ms-2" >
<br> {{data.label}}
<br>
<form [formGroup]="registerForm" (ngSubmit)="onSubmit()">
<div class="row p-3 ">
<div class="col ">
<div class="form-group required" [style]="{height: formGroupheight}">

<div class="form-group required" [style]="{height: formGroupheight,width:'500px'}">
<label for="dataCtrl"> {{data.label}}</label>
<input *ngIf="!loggedUser.enableRichTextForVMComment" id="dataCtrl" formControlName="dataCtrl">
<quill-editor *ngIf="loggedUser.enableRichTextForVMComment" id="dataCtrl" [styles]="{height: '150px'}" formControlName="dataCtrl" ngDefaultControl></quill-editor>
<quill-editor *ngIf="loggedUser.enableRichTextForVMComment" id="dataCtrl" [styles]="{height: '150px'}" [modules]="quillConf" formControlName="dataCtrl" ngDefaultControl [ngClass]="{ 'quill-editor-is-invalid': submitted && f.dataCtrl.errors }"></quill-editor>
<div *ngIf="submitted && f.dataCtrl.errors" class="invalid-feedback">
<div class="ms-1" *ngIf="f.dataCtrl.errors.required">{{data.label}} is required</div>
</div>
</div>
</div>
</div>
<div class="row ">
<div class="col float-end">
<div class="col float-end mt-5">

<button type="submit" mat-button class="float-end">Ok</button>
<button type="button" mat-button (click)="onClose()" class="float-end">Cancel</button>
Expand Down
54 changes: 29 additions & 25 deletions src/app/public/widget/alert-dialog/comment-dialog.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
float: inline-end !important;
/*fallback for chrome*/
float: right !important;
}

.quill-editor-is-invalid ~ .invalid-feedback {
display: block;
}
Loading