Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/pn-4727
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreaCimini90 committed May 20, 2024
2 parents 479bf47 + c8d06cc commit aa6fda2
Show file tree
Hide file tree
Showing 19 changed files with 2,112 additions and 1,244 deletions.
2 changes: 1 addition & 1 deletion packages/pn-pa-webapp/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const ActualApp = () => {
if (IS_STATISTICS_ENABLED) {
// eslint-disable-next-line functional/immutable-data
basicMenuItems.splice(1, 0, {
label: 'Statistiche',
label: 'menu.statistics',
icon: StatisticsIcon,
route: routes.STATISTICHE,
});
Expand Down
37 changes: 25 additions & 12 deletions packages/pn-pa-webapp/src/api/statistics/Statistics.api.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
import { StatisticsParams, StatisticsResponse } from '../../redux/statistics/types';
import { StatisticsParams, StatisticsParsedResponse } from '../../models/Statistics';
import statisticsDataFactoryManager from '../../utility/StatisticsData/StatisticsDataFactoryManager';
// import { apiClient } from '../apiClients';
import { statisticsMockResponse } from './statistics.mock';

// import { STATISTICS } from './statistics.routes';

export const StatisticsApi = {
/**
* Gets current user notifications
* @param {string} startDate
* @param {string} endDate
* @returns Promise
*/
export /**
* Retrieve statistics data from the backend
*
* @type {{ getStatistics: (params: StatisticsParams<string>) => Promise<StatisticsParsedResponse>; }}
*/
const StatisticsApi = {
// getStatistics: (params: StatisticsParams<string>): Promise<StatisticsParsedResponse> =>
// apiClient.get<StatisticsResponse>(STATISTICS(params)).then((response) => {
// const rawData = response.data;

// getStatistics: (params: StatisticsParams<string>): Promise<StatisticsResponse> =>
// apiClient.get<StatisticsResponse>(STATISTICS(params)).then((response) => response.data),
getStatistics: (params: StatisticsParams<string>): Promise<StatisticsResponse> =>
getStatistics: (params: StatisticsParams<string>): Promise<StatisticsParsedResponse> =>
new Promise((resolve) => {
console.info(params);
resolve(statisticsMockResponse);
const factory = statisticsDataFactoryManager.factory;
const parsedData = factory.createAll(statisticsMockResponse);
const rawData = statisticsMockResponse;

resolve({
sender_id: rawData.sender_id,
genTimestamp: rawData.genTimestamp,
lastDate: rawData.lastDate,
startDate: rawData.startDate,
endDate: rawData.endDate,
data: parsedData,
});
}),
};
Loading

0 comments on commit aa6fda2

Please sign in to comment.