From 7eb371bf3013ccc932469d7966ebf3db7b7b30a0 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 11 Mar 2021 16:09:33 +0800 Subject: [PATCH 01/51] updated version to v1.0.8 --- CHANGELOG.md | 24 +++++++++++++++++++++--- admin/views/common/footer-login.html | 2 +- admin/views/common/footer.html | 2 +- database/upgrade1.0.8.sql | 3 +++ myems-api/core/version.py | 4 ++-- web/package.json | 2 +- web/src/config.js | 2 +- 7 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 database/upgrade1.0.8.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 92893e3b..cf3c8380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added -- added excel exporter of equipmentincome report -- added excel exporter of shopfloorsaving report +- None. + +### Changed +- None. + +### Fixed +- None. + +### Removed +- None. + + +## [v1.0.8] - 2021-03-11 +### Added +- added excel exporter of combinedequipmentstatistics report +- added translation for German +- added excel exporter of storesaving report +- added excel exporter of equipmentincome report +- added excel exporter of shopfloorsaving report - added excel exporter of equipmentload report ### Changed @@ -79,7 +96,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. -[Unreleased]: https://github.com/MyEMS/myems/compare/v1.0.7...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.0.8...HEAD +[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.7...v1.0.8 [v1.0.7]: https://github.com/MyEMS/myems/compare/v1.0.6...v1.0.7 [v1.0.6]: https://github.com/MyEMS/myems/compare/v1.0.5...v1.0.6 [v1.0.5]: https://github.com/MyEMS/myems/releases/tag/v1.0.5 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 3ceedced..32fa2dfe 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index d5534c93..becd5fb4 100644 --- a/admin/views/common/footer.html +++ b/admin/views/common/footer.html @@ -3,6 +3,6 @@ https://myems.ioooQq3D}-j
znHafgb)z{sw`{wED@mO5s+E5EP7Lj0NA{h7pLZ(~1-e>Xq}*k1&iO@JGqCcFoTJ))
zty_DJ)%UdC=qw;3U)YM@fZ9{0l4+>!@|hC`AzbGn!6*-UjV({$Fpy&plRVmC
z4Mv}u1M-9CAy38@Ja2PQb54)R#d0wQXv;aanLaB#sLLt$eNy|GeIfeP7wpSLo#v`P
zR9l)4RbHgSGjLI}_TY YtbkO`f-xmpVxK9`PcoH=m@*jbtL&pHSGlQU`+_q;( e!c+$C{z0!x;s!`NmX`v5&>rd6XlnqR!>RAY=B}kSNoU
zQa888U|G1{By=NHHUfS5TY$tT$Kf;la%7u3QTp%meXk?lZVDcuZK{;(P6)~h(=)WZ
zpEjT!OQ0H0dxO=p+qg9y5aVr;NJCI%oo#t}MYkLgd|72mPwuFwzZ`a0W9+qKKll9;
zUgRykzw06|*ES%gXyzAq_oGWkEwiLpH`O#cRm}inQt=SrUL(2eJhtZVYxkwSt2Nec
z+sent5R518_xXBb?{)~#e^P^4sctd~eze}nD{8G-p55g*{z_nxkM_`TK-SI4y2oU|
ze_3DAP)YulE6V7w6j9V~x@70C4=@Pc+U}xS7V$(eu{Fdxe$CqItT%7Y(Oa#Fr0ce&n(^CI6+f)RxO32sM4s-~T-TdbjdK+Xh}K2BjB$#w#whFMhse
z4+~O~UPqYa0PFgNr`jw;^jg!&0%n0ugLH$&>_?6wi}g3RX2(N?j!^ZPrEL$nN(q1a
zFz=X%qMvY(UMrSiyco}~|6`pCjP@XV5g~c=NF40__-wwscu52gtFDOEKAKsLo!(0_
zuZ7jfUr@yyC`xe}E#7a=+ny&xprQ_P02%)GnsDt&Iwzv*T9G>A%#LRU{t9hCZ1=cN
zk(BBo$5^0bCeNIfb$IUb3@V`RU|>~h*>skuV0NlzF>XRsadYz&l#~ypGqdmgVj!De
z4PO2ncchNOIkj`b+8%EL`b@r;?|nJAs)Nmfabn=IkfMJNW*x15KSalHj|8E^E#6;^
z4?H?~;qomy0yBJ
3Y>WW6BqzpzWHXtCFqZGv$pok47D*6Ev
z>&tJyKj7ZSeZ0^6z8~*%&g=C&o0~8Z=$q4&N-*hquaf?-`AOul(*0JuB(Z)afd^7|
zhe5c881C6J#m|^dqX@{(a+kpKL7fNtQxmrA7d~CJD)#ykI{@TZHgNy(aTIXpt_29X
z^-VVa)Io*)29O!gQU0)BW&~+6lG}dkmwgQ690rpWAAW8*7L1V?Px9>@of}Wnl}{=g
zhVN&Me*IXPm$+MI&VHN}6%%)D^{+F@-r3Fuy%Pxr
WlfWoT!S5=O
z?fJphVFq7ppKso{CoZU_rDY+;e3flE(ztdDdrY+LDso8>C&!)&b_VgTJ71i=xupKa
zOlY7|Hjx^n>{K@fHeB>>DzfbS=Gkg<
+yLe?@MkwVE8$
z4M}6RF?3Jh{SubwfBJ^p+lfy49@JKfRN=QS9`g$To8+HIi5$=c5Wg5ar?@$&kbNNS
z;jZ&~K08-i-uKk}9U-SxEQ1GiF_cin&Sh7`m?epas!}lk8xV=Dpp~}W3otmNXgCJo
z&6)BTb~|?x`f9R~^8`3=mmdF8ITuJ&gV(Ch*a(+IMQB2TygY|C#shy&9^vwnKYl>p
zTypf
dhjSv|
zrnKMq+o%5quXUqYOu;IOZ8{M^tfyCXbZidYja3ZC0o3Y$CRlq%zzb1ITbIt?uiS+J
zSoXEf!#+s|Mll=RA$9QLx5?Zm1=h7w$d%y`@TU6!wHIFeY}TB19?;fcj}8kl1G?vh
zhf=Th7R7o8xJ}*8vHuKT`O*D2v1v;0#or0!Yxc_J<%eK
)xJ%cvxHj0l+qR8tq%p^*K;L+d*%j4#UL*`*yv@5nqHeWq)oc;plB7@ub
z^q8sjGIAeDXQZgWaBYz^wi;$C2K8ombV?7Sd&n+8U^94FVX3k8@dy+47%vPPZtRQs
zIc(_JqriLya`*-P?#vOs)2zp8HGz4Jz-=D>wnku|>z-N|oOrJ~5Yk&6H~f8*-A|{W~sH8RZsBMaC=3<8%x8R*Kn$d}w7`&s~|+%sGP9D%Gy(Syc!V
zT>y1j&RS6lo4P!#3*Ft^<8RUeucZ|3;=q*I@lqJax=>)RCa|sZaCk3ptLt60k@Ph~
zmNqiRXc_)ry3*<~>T+78yIvhT#p!X_Q_n