Commit Graph

352 Commits (7345f1de8a118816537b66ac26e23a5780e1fdb6)

Author SHA1 Message Date
Caozhenhui 7345f1de8a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 12:58:04 +08:00
13621160019@163.com 67be8e5b04 added excel exporter of storesaving report
Merge branch 'PR14' into develop
2021-03-10 11:33:13 +08:00
13621160019@163.com 1da9704abf updated excel exporter of spacesaving and tenantsaving reports
Merge branch 'PR12' into develop
2021-03-10 09:54:21 +08:00
13621160019@163.com 54de71ed7b added excel exporter of combinedequipmentincome report
Merge branch 'PR68' into develop
2021-03-09 18:28:28 +08:00
13621160019@163.com df5a823070 added excel exporter combinedequipmentincome report 2021-03-09 18:28:15 +08:00
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
tianlinzhong d2bae2cc8c Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 21:58:18 +08:00
tianlinzhong 958bc74dbf add 2021-03-08 21:58:08 +08:00
13621160019@163.com c22e05af3f changed the decimals to 0 for CountUp of cardsummyItems in dashboard 2021-03-08 19:36:36 +08:00
13621160019@163.com b7b991fd62 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:23:38 +08:00
13621160019@163.com 1fcfacf366 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:15:03 +08:00
Caozhenhui 7a322f5b4d Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 16:58:29 +08:00
Caozhenhui bc371f9a44 Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 16:56:32 +08:00
13621160019@163.com 753fa733e5 updated README and CHANGELOG 2021-03-08 16:34:37 +08:00
Caozhenhui 4f7ccfa0cc Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 15:32:17 +08:00
YangZhang-GitHub 2b852e2634 Added 'excelexporters.storesaving.export()' method 2021-03-08 15:26:01 +08:00
YangZhang-GitHub 5f405215f6 Implemented the StoreSaving Excel Exporter 2021-03-08 15:24:47 +08:00
YangZhang-GitHub 5221016bd4 Add the data of per unit area 2021-03-08 15:22:47 +08:00
13621160019@163.com 6612269ab3 added excel exporter of equipmentincome report
Merge branch 'PR65' into develop
2021-03-08 15:22:20 +08:00
13621160019@163.com a0be801275 added excel exporter of shopfloorsaving report
Merge branch 'PR11' into develop
2021-03-08 14:21:40 +08:00
YangZhang-GitHub d0f364b287 Increase the proportion column 2021-03-08 10:25:02 +08:00
YangZhang-GitHub b067abb46d Implemented the ShopFloorSaving Excel Exporter 2021-03-08 09:58:32 +08:00
YangZhang-GitHub f55d9734f2 Added 'excelexporters.shopfloorsaving.export()' method 2021-03-08 09:56:01 +08:00
Caozhenhui ba649a1804 Merge remote-tracking branch 'upstream/develop' into issue40 2021-03-07 23:07:30 +08:00
Caozhenhui 9e3c0f2f94 config 2021-03-07 23:03:57 +08:00
13621160019@163.com 8cbdd48221 added excel exporter of equipmentload report
Merge branch 'PR66' into develop
2021-03-07 19:23:37 +08:00
hyh123a 029ce72b80 Merge remote-tracking branch 'origin_myems/develop' into issure31 2021-03-07 19:05:51 +08:00
hyh123a 4b7691342a revert the translation 2021-03-07 18:59:24 +08:00
13621160019@163.com baab37cfce Merge branch 'master' into develop 2021-03-07 16:55:44 +08:00
13621160019@163.com e5176eb9b0 updated version number to v1.0.7 2021-03-07 16:45:29 +08:00
tianlinzhong b52f1ef42d Implemented the equipmentincome Excel export 2021-03-07 15:47:57 +08:00
13621160019@163.com d8f488ee3c Merge branch 'develop' 2021-03-07 15:30:49 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
13621160019@163.com 58217f75bf added excel exporter of storeload report
Merge branch 'develop'
2021-03-07 14:59:04 +08:00
13621160019@163.com 98ff0adcae added excel exporter of storeload report
Merge branch 'PR10' into develop
2021-03-07 14:57:39 +08:00
13621160019@163.com 2405bf3a32 added excel exporter of spaceincome report
Merge branch 'develop'
2021-03-07 13:47:10 +08:00
13621160019@163.com 6ca8f86f73 added excel exporter of spaceincome report
Merge branch 'PR64' into develop
2021-03-07 13:45:51 +08:00
tianlinzhong f73e528a9a delete unrelated code and Correct errors in Reports 2021-03-07 13:07:11 +08:00
13621160019@163.com b3c14adeee Merge branch 'develop' 2021-03-07 11:57:16 +08:00
13621160019@163.com be39176900 Merge branch 'PR5' into develop 2021-03-07 11:56:14 +08:00
13621160019@163.com 0d667e6e1d fixed PEP8 warning in spacesaving 2021-03-07 11:56:00 +08:00
Caozhenhui c50840a720 Implemented the storeload Excel Exporter 2021-03-07 11:47:11 +08:00
13621160019@163.com 91dc1f5a0b Merge branch 'develop' 2021-03-07 11:17:55 +08:00
13621160019@163.com 75015e1417 fixed DivisionUndefined issues in combinedequipmentsaving 2021-03-07 11:16:50 +08:00
13621160019@163.com 43fffd6700 Merge branch 'develop' 2021-03-07 11:10:06 +08:00
13621160019@163.com 30522bc75a added excel exporter of equipmentsaving report
Merge branch 'PR8' into develop
2021-03-07 11:08:58 +08:00
13621160019@163.com cd6237d57c fixed divide by zero issues in equipmentsaving 2021-03-07 11:08:36 +08:00
13621160019@163.com 57a4bf377b removed abs functions for calculating percentage in equipmentsaving 2021-03-07 10:58:30 +08:00
13621160019@163.com 2ca35c980f Merge branch 'develop' 2021-03-07 10:53:43 +08:00
13621160019@163.com 0a797a96b5 removed abs function for calculating percentage in combinedequipmentsaving 2021-03-07 10:52:48 +08:00