From b609661c0363e1c9a51019441e97015ceef90441 Mon Sep 17 00:00:00 2001 From: "Notmoo-PC\\Notmoo" Date: Tue, 23 Jan 2018 18:02:22 +0100 Subject: [PATCH] =?UTF-8?q?[CORE]=20#12=20:=20Mise=20=C3=A0=20jour=20des?= =?UTF-8?q?=20types=20de=20champs=20de=20statistiques?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/StatisticFieldType.java | 6 ++++-- .../statistics/StatisticFields.java | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFieldType.java b/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFieldType.java index 0e90a064..7ab6f69f 100644 --- a/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFieldType.java +++ b/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFieldType.java @@ -1,6 +1,8 @@ package com.pqt.core.common_resources.statistics; public enum StatisticFieldType { - SIMPLE, - LIST + SIMPLE_NUMBER, + SIMPLE_CURRENCY, + LIST, + OTHER } diff --git a/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFields.java b/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFields.java index e09f7342..1007cc05 100644 --- a/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFields.java +++ b/Workspace/core/src/main/java/com/pqt/core/common_resources/statistics/StatisticFields.java @@ -2,14 +2,14 @@ package com.pqt.core.common_resources.statistics; public enum StatisticFields { - TOTAL_SALE_WORTH("total_sale_worth", StatisticFieldType.SIMPLE), - TOTAL_SALE_AMOUNT("total_sale_amount", StatisticFieldType.SIMPLE), - TOTAL_MONEY_MADE("total_money_made", StatisticFieldType.SIMPLE), + TOTAL_SALE_WORTH("total_sale_worth", StatisticFieldType.SIMPLE_CURRENCY), + TOTAL_SALE_AMOUNT("total_sale_amount", StatisticFieldType.SIMPLE_NUMBER), + TOTAL_MONEY_MADE("total_money_made", StatisticFieldType.SIMPLE_CURRENCY), TOP_POPULAR_PRODUCTS("top_popular_products", StatisticFieldType.LIST), - STAFF_SALE_WORTH("staff_sale_worth", StatisticFieldType.SIMPLE), - STAFF_SALE_AMOUNT("staff_sale_amount", StatisticFieldType.SIMPLE), - GUEST_SALE_WORTH("guest_sale_worth", StatisticFieldType.SIMPLE), - GUEST_SALE_AMOUNT("guest_sale_amount", StatisticFieldType.SIMPLE); + STAFF_SALE_WORTH("staff_sale_worth", StatisticFieldType.SIMPLE_CURRENCY), + STAFF_SALE_AMOUNT("staff_sale_amount", StatisticFieldType.SIMPLE_NUMBER), + GUEST_SALE_WORTH("guest_sale_worth", StatisticFieldType.SIMPLE_CURRENCY), + GUEST_SALE_AMOUNT("guest_sale_amount", StatisticFieldType.SIMPLE_NUMBER); private final String str; private final StatisticFieldType type;