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.

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

v1.14.1 #587

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"watch": "ng build --watch --configuration development",
"test": "ng test",
"test:ci": "ng test --no-watch --no-progress --code-coverage --browsers=ChromeHeadless",
"i18n:extract": "transloco-keys-manager extract -d \"\"",
"i18n:extract": "transloco-keys-manager extract -d \"\" -l de",
"i18n:find": "transloco-keys-manager find",
"cypress": "cypress open",
"sentry:sourcemaps": "sentry-cli sourcemaps inject --org localcrag --project localcrag-client ./dist/client && sentry-cli sourcemaps upload --org localcrag --project localcrag-client ./dist/client",
Expand Down
12 changes: 11 additions & 1 deletion client/src/app/models/scale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ export interface Grade {
value: number;
}

export type StackedChartBrackets = number[];
export type BarChartBracket = {
name: string;
value: number;
};
export type BarChartBrackets = BarChartBracket[];

export type GradeDistribution = Record<
LineType,
Record<string, Record<number, number>>
Expand All @@ -18,7 +25,10 @@ export class Scale {
lineType: LineType;
name: string;
grades?: Grade[];
gradeBrackets: number[];
gradeBrackets: {
stackedChartBrackets: StackedChartBrackets;
barChartBrackets: BarChartBrackets;
};

public static deserialize(payload: any): Scale {
const scale = new Scale();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { MessageModule } from 'primeng/message';
import { ScalesService } from '../../../services/crud/scales.service';
import { map } from 'rxjs/operators';
import { TranslateSpecialGradesPipe } from '../../shared/pipes/translate-special-grades.pipe';

@Component({
selector: 'lc-history-list',
Expand Down Expand Up @@ -61,6 +62,7 @@ export class HistoryListComponent implements OnInit {

constructor(
private historyService: HistoryService,
private translateSpecialGradesPipe: TranslateSpecialGradesPipe,
private router: Router,
private store: Store,
private transloco: TranslocoService,
Expand Down Expand Up @@ -127,8 +129,13 @@ export class HistoryListComponent implements OnInit {
if (event.type === HistoryItemType.UPDATED) {
switch (event.objectType) {
case ObjectType.Line:
/** t(history.grading_changed) */
return this.transloco.translate('history.grading_changed');
if (Number(event.newValue) >= 0) {
/** t(history.grading_changed) */
return this.transloco.translate('history.grading_changed');
} else {
/** t(history.project_status_changed) */
return this.transloco.translate('history.project_status_changed');
}
default:
return '';
}
Expand All @@ -153,16 +160,33 @@ export class HistoryListComponent implements OnInit {
Number(event.newValue),
),
]).pipe(
map((oldGrade, newGrade) => {
map(([oldGrade, newGrade]) => {
return [
this.translateSpecialGradesPipe.transform(oldGrade),
this.translateSpecialGradesPipe.transform(newGrade),
];
}),
map(([oldGrade, newGrade]) => {
if (
Number(event.oldValue) < 0 &&
Number(event.oldValue) < Number(event.newValue)
Number(event.oldValue) < Number(event.newValue) &&
Number(event.newValue) >= 0
) {
/** t(history.projectClimbed) */
return this.transloco.translate('history.projectClimbed', {
line: line.name,
newGrade,
});
} else if (
Number(event.oldValue) < 0 &&
Number(event.newValue) < 0
) {
/** t(history.projectStatusChanged) */
return this.transloco.translate('history.projectStatusChanged', {
line: line.name,
oldGrade,
newGrade,
});
} else if (
Number(event.oldValue) === 0 &&
Number(event.oldValue) < Number(event.newValue)
Expand Down Expand Up @@ -218,10 +242,12 @@ export class HistoryListComponent implements OnInit {
return 'pi pi-plus';
}
if (event.type === HistoryItemType.UPDATED) {
if (Number(event.oldValue) < Number(event.newValue)) {
return 'pi pi-arrow-up';
} else if (Number(event.oldValue) > Number(event.newValue)) {
return 'pi pi-arrow-down';
if (Number(event.newValue) >= 0) {
if (Number(event.oldValue) < Number(event.newValue)) {
return 'pi pi-arrow-up';
} else if (Number(event.oldValue) > Number(event.newValue)) {
return 'pi pi-arrow-down';
}
}
return 'pi pi-cog';
}
Expand Down
Loading