Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</table>
</div>
<div class="alert alert-dark mt-3">
Total: {{ this.resultSum.hours }} hours, {{ this.resultSum.minutes }} minutes, <br />
Total hours entries selected: {{ resultSumEntriesSelected.hours }} hours,
{{ resultSumEntriesSelected.minutes }} minutes
Total: {{ this.resultSum.hours }} hours, {{ this.resultSum.minutes }} minutes.<br />
Total time of entries selected: {{ resultSumEntriesSelected.hours }} hours,
{{ resultSumEntriesSelected.minutes }} minutes.
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="form-group">
<label>Technology:</label>
<label>Technologies:</label>

<ng-select
bindLabel="name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { debounceTime, distinctUntilChanged, filter } from 'rxjs/operators';
export class TechnologiesComponent implements OnInit, OnDestroy {
readonly MAX_NUM_TECHNOLOGIES = 10;
readonly NO_RESULTS_MESSAGE = 'No technologies found';
readonly TECHNOLOGIES_PLACEHOLDER = 'Time Entry Technologies';
readonly TECHNOLOGIES_PLACEHOLDER = 'Select Technologies';
readonly ALLOW_SELECT_MULTIPLE = true;
readonly ALLOW_SEARCH = true;
readonly MIN_SEARCH_TERM_LENGTH = 2;
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/store/entry.effects.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ describe('TimeEntryActionEffects', () => {
effects.loadEntriesByTimeRange$.subscribe(action => {
expect(toastrService.warning).toHaveBeenCalledWith(
'Still loading. Limit of ' + MAX_NUMBER_OF_ENTRIES_FOR_REPORTS +
' entries reached, try filtering the request by users or date.' +
' entries reached, try filtering the request.' +
' Some information may be missing.'
);
});
Expand Down