OK-530 unnecessary tooltips removed, long text displaying correctly now
diff --git a/src/app/common-components/main-navigation/main-navigation.component.html b/src/app/common-components/main-navigation/main-navigation.component.html index f642725..dd68691 100644 --- a/src/app/common-components/main-navigation/main-navigation.component.html +++ b/src/app/common-components/main-navigation/main-navigation.component.html
@@ -37,11 +37,11 @@ <span class="glyphicon glyphicon-question-sign"></span> </a> </div> - <div class="dropdown-open nav-user nav-overview-user"> + <div class="dropdown-open nav-user nav-overview-user" style="padding-top: 10px"> <a class="btn btn-logout dropdown-toggle" style="min-width: 160px;" type="button" data-toggle="dropdown" href="#" aria-expanded="true"> {{sessionContext.getAccessTokenDecoded()?.name}}<span class="caret"></span> </a> - <ul class="dropdown-menu" style="left: auto; right: auto;"> + <ul class="dropdown-menu" style="left: auto; right: auto; top: 40px;"> <li class="dropdown"> <a (click)="openDialogShiftChange()">Schicht übergeben</a> </li>
diff --git a/src/app/dialogs/file-import/file-import.component.html b/src/app/dialogs/file-import/file-import.component.html index b57dc9f..cc15ba1 100644 --- a/src/app/dialogs/file-import/file-import.component.html +++ b/src/app/dialogs/file-import/file-import.component.html
@@ -47,7 +47,7 @@ {{ fileModel.gridTerritoryName }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="fileModel.notificationText">{{ fileModel.notificationText }}</td> <td class="notification-tab-edit-buttons"> <button type="button" class="btn btn-primary btn-sm" (click)="importThisFile(fileModel)">
diff --git a/src/app/lists/abstract-list/abstract-list.component.css b/src/app/lists/abstract-list/abstract-list.component.css index 0952748..ce24e15 100644 --- a/src/app/lists/abstract-list/abstract-list.component.css +++ b/src/app/lists/abstract-list/abstract-list.component.css
@@ -62,6 +62,9 @@ min-width: 320px; max-width: 320px; text-align: left; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .notification-tab-status { @@ -71,20 +74,32 @@ text-align: center; } -.notification-tab-moduser { +.notification-tab-moduser-header, .notification-tab-moduser{ width: 1%; min-width: 130px; max-width: 130px; - text-align: left; + text-align: left; } -.notification-tab-responsibility-forwarding { +.notification-tab-moduser { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.notification-tab-responsibility-forwarding-header, .notification-tab-responsibility-forwarding { width: 1%; min-width: 120px; max-width: 120px; text-align: left; } +.notification-tab-responsibility-forwarding { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + .notification-tab-edit-buttons { width: 50px; min-width: 50px;
diff --git a/src/app/lists/abstract-list/abstract-list.component.ts b/src/app/lists/abstract-list/abstract-list.component.ts index e05b80c..fded4e1 100644 --- a/src/app/lists/abstract-list/abstract-list.component.ts +++ b/src/app/lists/abstract-list/abstract-list.component.ts
@@ -17,19 +17,13 @@ import { MessageService, MessageDefines } from '../../services/message.service'; import { BannerMessage } from '../../common/banner-message'; -declare var $: any; -declare var toastr: any; -window['$'] = $; -window['jQuery'] = $; - - @Component({ selector: 'app-abstract-list', templateUrl: './abstract-list.component.html', styleUrls: ['./abstract-list.component.css'] }) -export class AbstractListComponent implements OnInit, AfterViewChecked, OnChanges, OnDestroy { +export class AbstractListComponent implements OnInit, OnChanges, OnDestroy { @Output() onEditNotification = new EventEmitter<Notification>(); @Output() onLookUpNotification = new EventEmitter<Notification>(); @Input() shiftChangeTransactionId: number; @@ -71,10 +65,6 @@ } } - ngAfterViewChecked() { - $('[data-toggle="tooltip"]').tooltip({ container: 'body', html: true, trigger: 'hover' }); - } - ngOnDestroy() { this.subscriptions.forEach(item => item.unsubscribe()); } @@ -283,7 +273,7 @@ - if (this.sortingState.defaultState && !column || this.sortingState.counter > 0 && this.sortingState.counter % 3 === 0) { + if (this.sortingState.defaultState && !column || this.sortingState.counter > 0 && this.sortingState.counter % 3 === 0) { this.sortingState.counter = 0; this.notifications = Object.assign(new Array<Notification>(), this.defaultList); this.sortingState.defaultState = true; @@ -292,8 +282,8 @@ this.sortingState.defaultState = false; this.notifications.sort((a, b) => { - const a1 = this.getColumnValue(this.sortingState.column, a); - const b1 = this.getColumnValue(this.sortingState.column, b); + const a1 = this.getColumnValue(this.sortingState.column, a); + const b1 = this.getColumnValue(this.sortingState.column, b); if (a1 == null) { return 1 * direction; @@ -316,13 +306,13 @@ switch (columnName) { case 'fkRefBranch': - return this.sessionContext.getBrancheById(notification.fkRefBranch) ? + return this.sessionContext.getBrancheById(notification.fkRefBranch) ? this.sessionContext.getBrancheById(notification.fkRefBranch).name.toLowerCase() : null; case 'fkRefNotificationStatus': - return this.sessionContext.getStatusById(notification.fkRefNotificationStatus) ? + return this.sessionContext.getStatusById(notification.fkRefNotificationStatus) ? this.sessionContext.getStatusById(notification.fkRefNotificationStatus).name.toLowerCase() : null; case 'fkRefGridTerritory': - return this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory) ? + return this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory) ? this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory).name.toLowerCase() : null; default: return notification[columnName] ? notification[columnName].toLowerCase() : null;
diff --git a/src/app/lists/current-reminders/current-reminders.component.css b/src/app/lists/current-reminders/current-reminders.component.css index 6747d58..40c3565 100644 --- a/src/app/lists/current-reminders/current-reminders.component.css +++ b/src/app/lists/current-reminders/current-reminders.component.css
@@ -15,17 +15,6 @@ width: 20%; } -.might-overflow { - text-overflow: ellipsis; - overflow : hidden; - white-space: nowrap; -} - -.might-overflow:hover { - text-overflow: clip; - white-space: normal; - word-break: break-all; -} .finished { color:red; font-weight: bold;
diff --git a/src/app/lists/current-reminders/current-reminders.component.html b/src/app/lists/current-reminders/current-reminders.component.html index 1a11409..f625065 100644 --- a/src/app/lists/current-reminders/current-reminders.component.html +++ b/src/app/lists/current-reminders/current-reminders.component.html
@@ -38,7 +38,7 @@ <th class="notification-tab-finished-at-col"> <app-sorting [initColumnName]="'beginDate'" (click)="sort('beginDate')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Beginnt am</app-sorting> </th> - <th class="notification-tab-responsibility-forwarding"> + <th class="notification-tab-responsibility-forwarding-header"> <app-sorting [initColumnName]="'responsibilityForwarding'" (click)="sort('responsibilityForwarding')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Zuständigkeit / weitergeleitet an</app-sorting> </th> <th class="notification-tab-edit-buttons" *ngIf="withEditButtons"></th> @@ -70,7 +70,7 @@ {{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText">{{ notification.notificationText }}</td> <td class="notification-tab-finished-at-col">{{ notification.beginDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}</td> <td class="notification-tab-responsibility-forwarding">{{ notification.responsibilityForwarding }}</td> @@ -101,7 +101,7 @@ {{ sessionContext.getGridTerritoryById(notificationVersion.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notificationVersion.notificationText"> <span> {{ notificationVersion.notificationText }}
diff --git a/src/app/lists/finished-notifications/finished-notifications.component.html b/src/app/lists/finished-notifications/finished-notifications.component.html index 8ecc39c..7df4e24 100644 --- a/src/app/lists/finished-notifications/finished-notifications.component.html +++ b/src/app/lists/finished-notifications/finished-notifications.component.html
@@ -45,7 +45,7 @@ <th class="notification-tab-finished-at-col"> <app-sorting [initColumnName]="'finishedDate'" (click)="sort('finishedDate')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Geschlossen am </app-sorting> </th> - <th class="notification-tab-responsibility-forwarding"> + <th class="notification-tab-responsibility-forwarding-header"> <app-sorting [initColumnName]="'responsibilityForwarding'" (click)="sort('responsibilityForwarding')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Zuständigkeit / weitergeleitet an </app-sorting> </th> <th class="notification-tab-edit-buttons" *ngIf="withEditButtons"></th> @@ -77,7 +77,7 @@ {{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText">{{ notification.notificationText }}</td> <td class="notification-tab-finished-at-col">{{ notification.finishedDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}</td> <td class="notification-tab-responsibility-forwarding">{{ notification.responsibilityForwarding }}</td> @@ -113,7 +113,7 @@ {{ sessionContext.getGridTerritoryById(notificationVersion.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notificationVersion.notificationText"> <span> {{ notificationVersion.notificationText }}
diff --git a/src/app/lists/future-notifications/future-notifications.component.html b/src/app/lists/future-notifications/future-notifications.component.html index c5a86bf..8c7e33d 100644 --- a/src/app/lists/future-notifications/future-notifications.component.html +++ b/src/app/lists/future-notifications/future-notifications.component.html
@@ -48,7 +48,7 @@ <th class="notification-tab-finished-at-col"> <app-sorting [initColumnName]="'expectedFinishDate'" (click)="sort('expectedFinishDate')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Erledigt vorauss. bis</app-sorting> </th> - <th class="notification-tab-responsibility-forwarding"> + <th class="notification-tab-responsibility-forwarding-header"> <app-sorting [initColumnName]="'responsibilityForwarding'" (click)="sort('responsibilityForwarding')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Zuständigkeit / weitergeleitet an</app-sorting> </th> <th class="notification-tab-edit-buttons" *ngIf="withEditButtons"></th> @@ -83,7 +83,7 @@ {{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText">{{ notification.notificationText }}</td> <td class="notification-tab-finished-at-col">{{ notification.expectedFinishDate | formattedTimestamp: 'DD.MM.YYYY HH:mm'}}</td> <td class="notification-tab-responsibility-forwarding">{{ notification.responsibilityForwarding }}</td> @@ -110,7 +110,7 @@ {{ sessionContext.getGridTerritoryById(notificationVersion.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" style="overflow:hidden !important;text-overflow: ellipsis;" data-toggle="tooltip" + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notificationVersion.notificationText">{{ notificationVersion.notificationText }}</td> <td class="notification-tab-finished-at-col">{{ notificationVersion.expectedFinishDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}</td> <td class="notification-tab-responsibility-forwarding">{{ notificationVersion.responsibilityForwarding }}</td>
diff --git a/src/app/lists/open-notifications/open-notifications.component.css b/src/app/lists/open-notifications/open-notifications.component.css index 5e0d771..02a34f5 100644 --- a/src/app/lists/open-notifications/open-notifications.component.css +++ b/src/app/lists/open-notifications/open-notifications.component.css
@@ -6,17 +6,7 @@ text-overflow: ellipsis!important; overflow:hidden !important; } -.might-overflow { - text-overflow: ellipsis; - overflow : hidden; - white-space: nowrap; -} -.might-overflow:hover { - text-overflow: clip; - white-space: normal; - word-break: break-all; -} .finished { color:red; font-weight: bold;
diff --git a/src/app/lists/open-notifications/open-notifications.component.html b/src/app/lists/open-notifications/open-notifications.component.html index 7fa5ab9..1336999 100644 --- a/src/app/lists/open-notifications/open-notifications.component.html +++ b/src/app/lists/open-notifications/open-notifications.component.html
@@ -28,10 +28,10 @@ <th class="notification-tab-status"> <app-sorting [initColumnName]="'fkRefNotificationStatus'" (click)="sort('fkRefNotificationStatus')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column"> Status </app-sorting> </th> - <th class="notification-tab-moduser"> + <th class="notification-tab-moduser-header"> <app-sorting [initColumnName]="'responsibilityControlPoint'" (click)="sort('responsibilityControlPoint')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Letzter Bearbeiter </app-sorting> </th> - <th class="notification-tab-responsibility-forwarding"> + <th class="notification-tab-responsibility-forwarding-header"> <app-sorting [initColumnName]="'responsibilityForwarding'" (click)="sort('responsibilityForwarding')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Zuständigkeit / weitergeleitet an </app-sorting> </th> <th class="notification-tab-edit-buttons" *ngIf="withEditButtons"></th> @@ -64,8 +64,7 @@ {{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText" - style="overflow:hidden;text-overflow: ellipsis;"> + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"> <span> {{ notification.notificationText }} </span> @@ -110,8 +109,7 @@ {{ sessionContext.getGridTerritoryById(notificationVersion.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notificationVersion.notificationText" - style="overflow:hidden;text-overflow: ellipsis;"> + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notificationVersion.notificationText"> <span> {{ notificationVersion.notificationText }} </span>
diff --git a/src/app/lists/search-result-list/search-result-list.component.html b/src/app/lists/search-result-list/search-result-list.component.html index 86b93aa..b69f898 100644 --- a/src/app/lists/search-result-list/search-result-list.component.html +++ b/src/app/lists/search-result-list/search-result-list.component.html
@@ -29,10 +29,10 @@ <th class="notification-tab-status"> <app-sorting [initColumnName]="'fkRefNotificationStatus'" (click)="sort('fkRefNotificationStatus')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Status</app-sorting> </th> - <th class="notification-tab-moduser"> + <th class="notification-tab-moduser-header"> <app-sorting [initColumnName]="'responsibilityControlPoint'" (click)="sort('responsibilityControlPoint')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Letzter Bearbeiter</app-sorting> </th> - <th class="notification-tab-responsibility-forwarding"> + <th class="notification-tab-responsibility-forwarding-header"> <app-sorting [initColumnName]="'responsibilityForwarding'" (click)="sort('responsibilityForwarding')" [isDesc]="sortingState?.isDesc" [defaultState]="sortingState?.defaultState" [columnName]="sortingState?.column">Zuständigkeit / weitergeleitet an</app-sorting> </th> <th class="notification-tab-edit-buttons"></th> @@ -62,8 +62,7 @@ {{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }} </span> </td> - <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText" - style="overflow:hidden;text-overflow: ellipsis;"> + <td class="notification-tab-description" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"> <span> {{ notification.notificationText }} </span>