robbyson-frontend-library 1.0.56 → 1.0.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/pages/base-app-page.component.js +21 -2
- package/dist/types/tree/tree.types.js +2 -0
- package/dist/utils/date.utils.js +35 -2
- package/package.json +1 -1
- package/src/components/basic-button/basic-button.interface.ts +1 -0
- package/src/components/daily-chart/daily-chart.interface.ts +1 -1
- package/src/components/header-context-menu/header-context-menu.interface.ts +1 -0
- package/src/components/pages/base-app-page.component.tsx +34 -4
- package/src/components/result-chart/result-chart.interface.ts +2 -1
- package/src/components/weekly-chart/weekly-chart.interface.ts +2 -1
- package/src/services/profile.service.interface.ts +2 -0
- package/src/services/tree.service.interface.ts +1 -2
- package/src/states/main-container/tree-app.state.interface.ts +3 -0
- package/src/states/profile-container/profile-app.state.interface.ts +1 -0
- package/src/types/tree/tree.types.ts +2 -0
- package/src/utils/date.utils.ts +46 -3
|
@@ -32,10 +32,15 @@ var BaseAppPage = /** @class */ (function (_super) {
|
|
|
32
32
|
function BaseAppPage(props) {
|
|
33
33
|
var _this = _super.call(this, props) || this;
|
|
34
34
|
_this.headerLocale = "Header Locale";
|
|
35
|
+
_this._baseAppPageTitleRef = React.createRef();
|
|
36
|
+
_this._baseAppPaseTitle = "";
|
|
37
|
+
_this._profileHistoryService = IoC.GetInstance("ProfileService");
|
|
35
38
|
_this.translate = _this.translate.bind(_this);
|
|
36
39
|
_this.redirect = _this.redirect.bind(_this);
|
|
37
40
|
_this._localeService = IoC.GetInstance("LocaleService");
|
|
38
41
|
_this._themeService = IoC.GetInstance("ThemeService");
|
|
42
|
+
_this._profileHistoryService =
|
|
43
|
+
IoC.GetInstance("ProfileService");
|
|
39
44
|
return _this;
|
|
40
45
|
}
|
|
41
46
|
BaseAppPage.prototype.redirect = function () {
|
|
@@ -73,6 +78,18 @@ var BaseAppPage = /** @class */ (function (_super) {
|
|
|
73
78
|
}
|
|
74
79
|
return (_a = this._localeService).getLocaleByHandle.apply(_a, __spreadArray([text || ""], args, false));
|
|
75
80
|
};
|
|
81
|
+
BaseAppPage.prototype.focusOnTitle = function (title) {
|
|
82
|
+
if (title) {
|
|
83
|
+
this._baseAppPaseTitle = title;
|
|
84
|
+
}
|
|
85
|
+
var route = RobbysonNavigate.getRouteId();
|
|
86
|
+
var history = this._profileHistoryService.getSessionHistory();
|
|
87
|
+
if (this._baseAppPageTitleRef.current &&
|
|
88
|
+
history &&
|
|
89
|
+
history.endsWith(route)) {
|
|
90
|
+
this._baseAppPageTitleRef.current.focus();
|
|
91
|
+
}
|
|
92
|
+
};
|
|
76
93
|
BaseAppPage.prototype.render = function () {
|
|
77
94
|
var _this = this;
|
|
78
95
|
QueryParamsFactory.validate(this.paramsValidValues, this.paramsDefaultValues);
|
|
@@ -80,9 +97,11 @@ var BaseAppPage = /** @class */ (function (_super) {
|
|
|
80
97
|
return (React.createElement(PageContainer, null,
|
|
81
98
|
React.createElement(Header, { usePageHeader: this._usePageHeader },
|
|
82
99
|
React.createElement("div", null,
|
|
83
|
-
React.createElement(GenericButton, { onClick: function () { return _this.redirect(); }, "aria-label": "Voltar" },
|
|
100
|
+
React.createElement(GenericButton, { onClick: function () { return _this.redirect(); }, "aria-label": "Voltar para a tela anterior" },
|
|
84
101
|
React.createElement(LeftArrowLarge, { src: this._themeService.getIconAssetUrl("left-arrow-large"), isOperacaoPage: isOperacaoPage })),
|
|
85
|
-
React.createElement(Title, { tabIndex: 0
|
|
102
|
+
React.createElement(Title, { tabIndex: 0, ref: this._baseAppPageTitleRef, "aria-label": this._baseAppPaseTitle
|
|
103
|
+
? this._baseAppPaseTitle
|
|
104
|
+
: this.translate(this.headerLocale) }, this.translate(this.headerLocale))),
|
|
86
105
|
!this._avoidContextMenu && (React.createElement(ContextMenu, { className: "body-2-book" }, this.contextMenu()))),
|
|
87
106
|
React.createElement(Content, { contentMarginTop: this._contentMarginTop, usePageHeader: this._usePageHeader, avoidContextMenu: this._avoidContextMenu }, this.renderPage())));
|
|
88
107
|
};
|
|
@@ -89,4 +89,6 @@ export var TreeActionTypes;
|
|
|
89
89
|
TreeActionTypes["SET_UNIQUE_ID"] = "SET_UNIQUE_ID";
|
|
90
90
|
TreeActionTypes["SET_USER_CURRENT_SELECTED"] = "SET_USER_CURRENT_SELECTED";
|
|
91
91
|
TreeActionTypes["SUCCESS_DATA_TREE"] = "SUCCESS_DATA_TREE";
|
|
92
|
+
TreeActionTypes["SET_REFERENCE_RESULT"] = "SET_REFERENCE_RESULT";
|
|
93
|
+
TreeActionTypes["SET_DATETREE_RESULT"] = "SET_DATETREE_RESULT";
|
|
92
94
|
})(TreeActionTypes || (TreeActionTypes = {}));
|
package/dist/utils/date.utils.js
CHANGED
|
@@ -32,6 +32,31 @@ var DateUtils = /** @class */ (function () {
|
|
|
32
32
|
timeZone: "UTC",
|
|
33
33
|
});
|
|
34
34
|
};
|
|
35
|
+
DateUtils.toLocaleDateString = function (dateString, locale) {
|
|
36
|
+
try {
|
|
37
|
+
if (!dateString) {
|
|
38
|
+
return "";
|
|
39
|
+
}
|
|
40
|
+
var date = void 0;
|
|
41
|
+
if (typeof dateString === "string") {
|
|
42
|
+
date = new Date(dateString.includes("T")
|
|
43
|
+
? dateString
|
|
44
|
+
: dateString + "T00:00:00Z");
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
date = new Date(dateString);
|
|
48
|
+
}
|
|
49
|
+
return new Intl.DateTimeFormat(locale, {
|
|
50
|
+
day: "numeric",
|
|
51
|
+
month: "long",
|
|
52
|
+
year: "numeric",
|
|
53
|
+
timeZone: "UTC",
|
|
54
|
+
}).format(date);
|
|
55
|
+
}
|
|
56
|
+
catch (_a) {
|
|
57
|
+
return "";
|
|
58
|
+
}
|
|
59
|
+
};
|
|
35
60
|
DateUtils.getRemainingTimeFromNow = function (compareDate, complementaryText) {
|
|
36
61
|
if (!compareDate)
|
|
37
62
|
return {
|
|
@@ -69,8 +94,16 @@ var DateUtils = /** @class */ (function () {
|
|
|
69
94
|
var minutes = Math.floor((secondsAsNumber % 3600) / 60);
|
|
70
95
|
var seconds = Math.floor((secondsAsNumber % 3600) % 60);
|
|
71
96
|
var formattedHours = parseFloat(hours) > 0 ? hours.padStart(2, "0") : "00";
|
|
72
|
-
var formattedMinutes = minutes === 0
|
|
73
|
-
|
|
97
|
+
var formattedMinutes = minutes === 0
|
|
98
|
+
? "00"
|
|
99
|
+
: minutes < 10
|
|
100
|
+
? "0" + minutes
|
|
101
|
+
: minutes.toString();
|
|
102
|
+
var formattedSeconds = seconds === 0
|
|
103
|
+
? "00"
|
|
104
|
+
: seconds < 10
|
|
105
|
+
? "0" + seconds
|
|
106
|
+
: seconds.toString();
|
|
74
107
|
var result = "".concat(formattedHours, ":").concat(formattedMinutes, ":").concat(formattedSeconds);
|
|
75
108
|
if (valueNegative) {
|
|
76
109
|
result = "- ".concat(result);
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@ export interface IDailyChartProps extends IBaseComponentProp {
|
|
|
11
11
|
coin: number;
|
|
12
12
|
maxCoin: number;
|
|
13
13
|
result: string;
|
|
14
|
-
getDays?: (typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
14
|
+
getDays?: (treeNodeId: string, typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
15
15
|
goalResults: string;
|
|
16
16
|
hit:number;
|
|
17
17
|
date: string;
|
|
@@ -14,6 +14,7 @@ export interface IHeaderContextMenuProps extends IBaseComponentProp {
|
|
|
14
14
|
showCalendar?: boolean;
|
|
15
15
|
textBreakpointsClasses?: HeaderTextBreakpointsClasses;
|
|
16
16
|
selectedWeek?: Week;
|
|
17
|
+
treeResultCalendar?: boolean;
|
|
17
18
|
onButtonClick?: (
|
|
18
19
|
buttonName: IHeaderContextMenuButtons,
|
|
19
20
|
linkTo?: string
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { IoC } from "../../ioc";
|
|
3
|
-
import { ILocaleService, IThemeService } from "../../services";
|
|
4
|
-
|
|
3
|
+
import { ILocaleService, IProfileService, IThemeService } from "../../services";
|
|
5
4
|
import {
|
|
6
5
|
PageContainer,
|
|
7
6
|
Header,
|
|
@@ -25,6 +24,10 @@ export abstract class BaseAppPage<T, T1> extends React.Component<T, T1> {
|
|
|
25
24
|
protected _contentMarginTop?: number;
|
|
26
25
|
protected _usePageHeader?: boolean;
|
|
27
26
|
protected _avoidContextMenu?: boolean;
|
|
27
|
+
private _baseAppPageTitleRef = React.createRef<HTMLHeadingElement>();
|
|
28
|
+
private _baseAppPaseTitle = "";
|
|
29
|
+
private _profileHistoryService =
|
|
30
|
+
IoC.GetInstance<IProfileService>("ProfileService");
|
|
28
31
|
|
|
29
32
|
constructor(props: T) {
|
|
30
33
|
super(props);
|
|
@@ -32,6 +35,9 @@ export abstract class BaseAppPage<T, T1> extends React.Component<T, T1> {
|
|
|
32
35
|
this.redirect = this.redirect.bind(this);
|
|
33
36
|
this._localeService = IoC.GetInstance<ILocaleService>("LocaleService");
|
|
34
37
|
this._themeService = IoC.GetInstance<IThemeService>("ThemeService");
|
|
38
|
+
|
|
39
|
+
this._profileHistoryService =
|
|
40
|
+
IoC.GetInstance<IProfileService>("ProfileService");
|
|
35
41
|
}
|
|
36
42
|
private redirect(): void {
|
|
37
43
|
const state = RobbysonNavigate?.getHistoryState() as any;
|
|
@@ -66,6 +72,22 @@ export abstract class BaseAppPage<T, T1> extends React.Component<T, T1> {
|
|
|
66
72
|
return this._localeService.getLocaleByHandle(text || "", ...args);
|
|
67
73
|
}
|
|
68
74
|
|
|
75
|
+
protected focusOnTitle(title?: string): void {
|
|
76
|
+
if (title) {
|
|
77
|
+
this._baseAppPaseTitle = title;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
const route = RobbysonNavigate.getRouteId();
|
|
81
|
+
const history = this._profileHistoryService.getSessionHistory();
|
|
82
|
+
if (
|
|
83
|
+
this._baseAppPageTitleRef.current &&
|
|
84
|
+
history &&
|
|
85
|
+
history.endsWith(route)
|
|
86
|
+
) {
|
|
87
|
+
this._baseAppPageTitleRef.current.focus();
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
69
91
|
abstract contextMenu(): React.ReactNode;
|
|
70
92
|
|
|
71
93
|
abstract renderPage(): React.ReactNode;
|
|
@@ -83,7 +105,7 @@ export abstract class BaseAppPage<T, T1> extends React.Component<T, T1> {
|
|
|
83
105
|
<div>
|
|
84
106
|
<GenericButton
|
|
85
107
|
onClick={() => this.redirect()}
|
|
86
|
-
aria-label="Voltar"
|
|
108
|
+
aria-label="Voltar para a tela anterior"
|
|
87
109
|
>
|
|
88
110
|
<LeftArrowLarge
|
|
89
111
|
src={this._themeService.getIconAssetUrl(
|
|
@@ -92,7 +114,15 @@ export abstract class BaseAppPage<T, T1> extends React.Component<T, T1> {
|
|
|
92
114
|
isOperacaoPage={isOperacaoPage}
|
|
93
115
|
/>
|
|
94
116
|
</GenericButton>
|
|
95
|
-
<Title
|
|
117
|
+
<Title
|
|
118
|
+
tabIndex={0}
|
|
119
|
+
ref={this._baseAppPageTitleRef}
|
|
120
|
+
aria-label={
|
|
121
|
+
this._baseAppPaseTitle
|
|
122
|
+
? this._baseAppPaseTitle
|
|
123
|
+
: this.translate(this.headerLocale)
|
|
124
|
+
}
|
|
125
|
+
>
|
|
96
126
|
{this.translate(this.headerLocale)}
|
|
97
127
|
</Title>
|
|
98
128
|
</div>
|
|
@@ -11,7 +11,7 @@ export interface IResultChartProps extends IBaseComponentProp {
|
|
|
11
11
|
maxCoin: string;
|
|
12
12
|
overlay?: boolean;
|
|
13
13
|
indicator_id: string;
|
|
14
|
-
getDays?: (typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
14
|
+
getDays?: (treeNodeId: string,typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
15
15
|
result: string;
|
|
16
16
|
goalResults: string;
|
|
17
17
|
hit:number;
|
|
@@ -19,6 +19,7 @@ export interface IResultChartProps extends IBaseComponentProp {
|
|
|
19
19
|
colorDivision: number[];
|
|
20
20
|
isInitialPosition?: boolean;
|
|
21
21
|
tabIndex?: number;
|
|
22
|
+
node_id?: string;
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
export interface IResultChartState {
|
|
@@ -12,7 +12,7 @@ export interface IWeeklyChartProps extends IBaseComponentProp {
|
|
|
12
12
|
coin: string;
|
|
13
13
|
maxCoin: string;
|
|
14
14
|
overlay?: boolean;
|
|
15
|
-
getDays?: (typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
15
|
+
getDays?: (treeNodeId: string,typeReference: TypeReferenceEnum, indicator_id: string) => Promise<void>;
|
|
16
16
|
result: string;
|
|
17
17
|
goalResults: string;
|
|
18
18
|
indicator_id: string;
|
|
@@ -21,6 +21,7 @@ export interface IWeeklyChartProps extends IBaseComponentProp {
|
|
|
21
21
|
colorDivision: number[];
|
|
22
22
|
selectedReference ?: string;
|
|
23
23
|
tabIndex?: number;
|
|
24
|
+
node_id?: string;
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export interface IWeeklyData {
|
|
@@ -28,7 +28,7 @@ export interface ITreeService {
|
|
|
28
28
|
params,
|
|
29
29
|
}: TreeDTO.IGetAttributesTreeDTO): Promise<TreeAttributeModel[]>;
|
|
30
30
|
setDateTree(date: TreeDTO.ISelectedDateTreeDTO): void;
|
|
31
|
-
getDataTree(): Promise<any>;
|
|
31
|
+
getDataTree(isResult?: boolean): Promise<any>;
|
|
32
32
|
getDetailsTree(params: TreeDTO.IGetDetailsTreeDTO): Promise<TreeDetailModel>;
|
|
33
33
|
getTableTree(params: TreeDTO.IGetTableTreeDTO): Promise<TreeTableModel[]>;
|
|
34
34
|
selectedIndicator(params: TreeDTO.ISelectIndicatorsTreeDTO): void;
|
|
@@ -60,7 +60,6 @@ export interface ITreeService {
|
|
|
60
60
|
breadcrumbData: TreeDTO.IBreadcrumbData[];
|
|
61
61
|
minLevel: string;
|
|
62
62
|
}): [TreeModel["data"], TreeDTO.IBreadcrumbData[]];
|
|
63
|
-
getDataTree(params: TreeDTO.IGetDataTreeDTO): Promise<void>;
|
|
64
63
|
getSimulations(userId: number | undefined): Promise<void>;
|
|
65
64
|
getGraphData(simulationId?: string): Promise<void>;
|
|
66
65
|
insertSimulation(
|
|
@@ -27,6 +27,7 @@ interface ISimulationGroup {
|
|
|
27
27
|
export interface ITreeApp {
|
|
28
28
|
treeData: {
|
|
29
29
|
node: string | undefined;
|
|
30
|
+
node_result: string | undefined;
|
|
30
31
|
indicators: {
|
|
31
32
|
items: TreeIndicatorModel[];
|
|
32
33
|
selected: TreeIndicatorModel;
|
|
@@ -44,6 +45,7 @@ export interface ITreeApp {
|
|
|
44
45
|
initialReferenceDate: string;
|
|
45
46
|
};
|
|
46
47
|
reference: TypeReferenceEnum;
|
|
48
|
+
reference_result: TypeReferenceEnum;
|
|
47
49
|
attributes: {
|
|
48
50
|
items: TreeAttributeModel[];
|
|
49
51
|
selected: {
|
|
@@ -130,6 +132,7 @@ export interface ITreeApp {
|
|
|
130
132
|
errors: [];
|
|
131
133
|
};
|
|
132
134
|
selectedDate: string;
|
|
135
|
+
selectedDateResult: string;
|
|
133
136
|
isLoadingSimulation: boolean;
|
|
134
137
|
isLoadingTreeSimulation: boolean;
|
|
135
138
|
isLoading: boolean;
|
|
@@ -100,4 +100,6 @@ export enum TreeActionTypes {
|
|
|
100
100
|
SET_UNIQUE_ID = "SET_UNIQUE_ID",
|
|
101
101
|
SET_USER_CURRENT_SELECTED = "SET_USER_CURRENT_SELECTED",
|
|
102
102
|
SUCCESS_DATA_TREE = "SUCCESS_DATA_TREE",
|
|
103
|
+
SET_REFERENCE_RESULT = "SET_REFERENCE_RESULT",
|
|
104
|
+
SET_DATETREE_RESULT = "SET_DATETREE_RESULT"
|
|
103
105
|
}
|
package/src/utils/date.utils.ts
CHANGED
|
@@ -46,6 +46,38 @@ export class DateUtils {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
+
static toLocaleDateString(
|
|
50
|
+
dateString: string | Date,
|
|
51
|
+
locale: string
|
|
52
|
+
): string {
|
|
53
|
+
try {
|
|
54
|
+
if (!dateString) {
|
|
55
|
+
return "";
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
let date: Date;
|
|
59
|
+
|
|
60
|
+
if (typeof dateString === "string") {
|
|
61
|
+
date = new Date(
|
|
62
|
+
dateString.includes("T")
|
|
63
|
+
? dateString
|
|
64
|
+
: dateString + "T00:00:00Z"
|
|
65
|
+
);
|
|
66
|
+
} else {
|
|
67
|
+
date = new Date(dateString);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
return new Intl.DateTimeFormat(locale, {
|
|
71
|
+
day: "numeric",
|
|
72
|
+
month: "long",
|
|
73
|
+
year: "numeric",
|
|
74
|
+
timeZone: "UTC",
|
|
75
|
+
}).format(date);
|
|
76
|
+
} catch {
|
|
77
|
+
return "";
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
49
81
|
static getRemainingTimeFromNow(
|
|
50
82
|
compareDate: Date,
|
|
51
83
|
complementaryText: string
|
|
@@ -97,9 +129,20 @@ export class DateUtils {
|
|
|
97
129
|
const minutes = Math.floor((secondsAsNumber % 3600) / 60);
|
|
98
130
|
const seconds = Math.floor((secondsAsNumber % 3600) % 60);
|
|
99
131
|
|
|
100
|
-
let formattedHours =
|
|
101
|
-
|
|
102
|
-
let
|
|
132
|
+
let formattedHours =
|
|
133
|
+
parseFloat(hours) > 0 ? hours.padStart(2, "0") : "00";
|
|
134
|
+
let formattedMinutes =
|
|
135
|
+
minutes === 0
|
|
136
|
+
? "00"
|
|
137
|
+
: minutes < 10
|
|
138
|
+
? "0" + minutes
|
|
139
|
+
: minutes.toString();
|
|
140
|
+
let formattedSeconds =
|
|
141
|
+
seconds === 0
|
|
142
|
+
? "00"
|
|
143
|
+
: seconds < 10
|
|
144
|
+
? "0" + seconds
|
|
145
|
+
: seconds.toString();
|
|
103
146
|
|
|
104
147
|
let result = `${formattedHours}:${formattedMinutes}:${formattedSeconds}`;
|
|
105
148
|
|