From a8e7e79ebff4323fe61f1f71806318da887136e7 Mon Sep 17 00:00:00 2001 From: David Cadena Date: Thu, 17 Mar 2022 12:15:22 -0500 Subject: [PATCH] style: TT-582 improved the clocked in hour text and current time box --- package-lock.json | 2 +- package.json | 2 +- .../customer-list.component.scss | 28 +++++++++++++++++++ .../customer-list/customer-list.component.ts | 4 ++- .../time-entries-table.component.scss | 28 +++++++++++++++++++ .../details-fields.component.html | 2 +- .../details-fields.component.scss | 11 ++++++++ .../month-picker/month-picker.component.html | 2 +- .../month-picker/month-picker.component.scss | 4 +++ .../entry-fields/entry-fields.component.html | 2 +- .../entry-fields/entry-fields.component.scss | 11 ++++++++ .../time-entries-summary.component.css | 4 ++- .../pages/time-entries.component.scss | 28 +++++++++++++++++++ .../pages/time-entries.component.ts | 1 + .../users-list/users-list.component.css | 28 +++++++++++++++++++ .../users-list/users-list.component.ts | 4 ++- 16 files changed, 153 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd36e6330..1eaf616db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.66.0", + "version": "1.69.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 34317102b..05ea62f7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.66.0", + "version": "1.69.1", "scripts": { "config": "ts-node ./scripts/setenv.ts", "preinstall": "npx npm-force-resolutions", diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss index e69de29bb..f8d73e904 100644 --- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss +++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss @@ -0,0 +1,28 @@ +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; + color: #ff5e0a; + -webkit-text-stroke: 2px white; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} + +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts index 7e39b78fd..dbb0d79af 100644 --- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts +++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts @@ -30,7 +30,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit { @Output() changeValueShowCustomerForm = new EventEmitter(); @Input() customers: CustomerUI[] = []; - dtOptions: any = {}; + dtOptions: any = { + columnDefs: [{orderable: false, targets: [2]}] + }; dtTrigger: Subject = new Subject(); @ViewChild(DataTableDirective, { static: false }) dtElement: DataTableDirective; diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 82fab2e2a..34034aa2b 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -55,3 +55,31 @@ $url-hover-color: darken($url-base-color, 20); } } +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; + color: #ff5e0a; + -webkit-text-stroke: 2px white; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} + +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 6409e16b6..3ecc6f7e6 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -65,7 +65,7 @@ id="uri" type="text" placeholder="Enter Jira ticket URL" - class="form-control" + class="url-ticket-input form-control" aria-label="Small" aria-describedby="inputGroup-sizing-sm" /> diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.scss b/src/app/modules/shared/components/details-fields/details-fields.component.scss index b1a0ef610..30255b5e9 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.scss +++ b/src/app/modules/shared/components/details-fields/details-fields.component.scss @@ -119,3 +119,14 @@ input[type="date"]::-webkit-clear-button { ::ng-deep .cdk-overlay-container { z-index: 1100 !important; } + +.url-ticket-input { + border: 1px solid #ced4da; + border-radius: 0.25rem; +} + +::ng-deep .ngx-timepicker { + border: 1px solid #ced4da; + border-radius: 0.25rem; + padding: 2px; +} diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.html b/src/app/modules/shared/components/month-picker/month-picker.component.html index 431d75ffc..4229aa45b 100644 --- a/src/app/modules/shared/components/month-picker/month-picker.component.html +++ b/src/app/modules/shared/components/month-picker/month-picker.component.html @@ -22,7 +22,7 @@
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.scss b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.scss index dc47b027b..c6532e8d9 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.scss +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.scss @@ -9,3 +9,14 @@ .hidden { display: none; } + +.url-ticket-input { + border: 1px solid #ced4da; + border-radius: 0.25rem; +} + +::ng-deep .ngx-timepicker { + border: 1px solid #ced4da; + border-radius: 0.25rem; + padding: 2px; +} diff --git a/src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css b/src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css index 5b8da2167..73c13fbc0 100644 --- a/src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css +++ b/src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css @@ -10,6 +10,7 @@ bottom: 9px; } + .clock-out{ text-align: center; } @@ -26,4 +27,5 @@ -webkit-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56); -moz-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56); color: #fff; -} \ No newline at end of file +} + diff --git a/src/app/modules/time-entries/pages/time-entries.component.scss b/src/app/modules/time-entries/pages/time-entries.component.scss index e69de29bb..f8d73e904 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.scss +++ b/src/app/modules/time-entries/pages/time-entries.component.scss @@ -0,0 +1,28 @@ +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; + color: #ff5e0a; + -webkit-text-stroke: 2px white; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} + +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts index 0ecdbc921..7bbbb794e 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -24,6 +24,7 @@ import { CalendarView } from 'angular-calendar'; export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit { dtOptions: any = { order: [[ 0, 'desc' ]], + columnDefs: [{orderable: false, targets: [6]}], destroy: true, }; dtTrigger: Subject = new Subject(); diff --git a/src/app/modules/users/components/users-list/users-list.component.css b/src/app/modules/users/components/users-list/users-list.component.css index e69de29bb..f8d73e904 100644 --- a/src/app/modules/users/components/users-list/users-list.component.css +++ b/src/app/modules/users/components/users-list/users-list.component.css @@ -0,0 +1,28 @@ +table.dataTable thead th { + position: relative; +} + +table.dataTable thead th.sorting:after, +table.dataTable thead th.sorting_asc:after, +table.dataTable thead th.sorting_desc:after { + position: absolute; + top: 10px; + right: 3px; + display: block; + font-family: Arial, Helvetica, sans-serif; + color: #ff5e0a; + -webkit-text-stroke: 2px white; +} + +table.dataTable thead .sorting_asc::after { + content: "▲"; +} + +table.dataTable thead .sorting_desc::after { + content: "▼"; +} + +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + background-image: none; +} diff --git a/src/app/modules/users/components/users-list/users-list.component.ts b/src/app/modules/users/components/users-list/users-list.component.ts index 36758778d..e5d1d5f6b 100644 --- a/src/app/modules/users/components/users-list/users-list.component.ts +++ b/src/app/modules/users/components/users-list/users-list.component.ts @@ -22,7 +22,9 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit { dtTrigger: Subject = new Subject(); @ViewChild(DataTableDirective, { static: false }) dtElement: DataTableDirective; - dtOptions: any = {}; + dtOptions: any = { + columnDefs: [{ orderable: false, targets: [2]}] + }; switchGroupsSubscription: Subscription; isDevelopment = true;