From dfd176fbb805e8ebe736fc197fb571e518c0732d Mon Sep 17 00:00:00 2001 From: Pavel Shevchenko Date: Wed, 25 Jan 2023 11:05:52 +0100 Subject: [PATCH 1/2] Trim zeros when comparing decimals --- Audit trail.mpr | Bin 14716928 -> 14716928 bytes .../audittrail/log/CreateLogObject.java | 30 ++++++++++-------- widgets/formatstring.mpk | Bin 8177 -> 8079 bytes 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Audit trail.mpr b/Audit trail.mpr index 6436cfd195f59c9ab21253a2dfff4a2109d59497..934dda6ba29e82b8185ec17e0b10b46000accb6c 100644 GIT binary patch delta 750 zcmWO2*IEbw0D#f2>{<56-h{}?ra>etk^S3SiIAE2?U9)+d+)vX-h0zqxYfmZfs>Jw zStuhiM1C*x&;Oq5A7S*FNTnI_XESyE(%q{>X0C22BS=Ez)0 zmw7T@7RW+bB#R|OmPn>7m1UwVmld*7R>^8vBWq=ytd|XvB^zavY?dvuRklgCY?mFf zQ+CO2*&};ppXA7XIUon+kQ|mHa#W7VaXBF;<&>P3GjdkW$$7aT7v+*%mMd~quE}+| zAvfig+?G3XSMJGuc_0tvkvx_s@>HJ5b9o^z<(0gaH}Y2A$$R-AALWyLmM`*EzR7p_ zAwT7p{FXoR_cFQvfRMQs28 delta 750 zcmWO2ReKHq06^jA(`~xD4Kv+Lo8AnYI_hI#degRXbk}ru_jGsHbnIWa<>LJVZ`%Hh z{AvGfs1yintlTXSNJj#aOL9vd$t(FJzZ8&yQb-C*5h*Igq_~7g2`MS1q_mWgvQkdU zO9iPYm87y%k*ZQns!I*2DYc}w)RDSUPwGnpX(*x6NE%BM36rK0F3qI5w2+q4N?J=B zX)Eody>yU{(n&f?7m1Lr(oMQc59ukrq_^~uNa-v6q`wT1fig%2OO!;*5Q&kYGE9a` zti;I(87ZS=w2YDeKVxN_jF$;AQGzl_CQG~|NTMXk6iJq;GEJt-44EmjWVWP8s?3qO zGEe5q0$C`FWU-`4x@5=_St`mhSuQJNrL2%JHMuS~ zgFZnHhu8{M$cxZH7YFKE`U}|Fg#JIR%Y|6A@$ createReferenceSetLogLine(final IMendixObject private static String getMemberValueString(final IMendixObjectMember member, final boolean fromCache, final IContext context) { Object value = null; - // Values from cache - if (fromCache == true) + + if (fromCache == true) { + // Values from cache value = member.getValue(context); - - // Values form DB - else + } else { + // Values form DB value = member.getOriginalValue(context); + } if (value != null) { - - if (value instanceof Date) + if (value instanceof Date) { return parseDate((Date) value, context); - - else if (value instanceof String) + } else if (value instanceof BigDecimal) { + return String.valueOf(((BigDecimal) value).stripTrailingZeros()).trim(); + } else if (value instanceof String) { return (String) value; - - return String.valueOf(value).trim(); - } else - return ""; + } else { + return String.valueOf(value).trim(); + } + } + + return ""; } private static String parseDate(final Date date, final IContext context) { diff --git a/widgets/formatstring.mpk b/widgets/formatstring.mpk index a3a4300ec84a7e9545468fcd2cc037d25bb9bd04..ce866fe2760261cebd9b7a09c2c27ac0aa86ee25 100644 GIT binary patch literal 8079 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 Date: Mon, 30 Jan 2023 15:54:19 +0100 Subject: [PATCH 2/2] Add unchanged decimals to test --- Audit trail.mpr | Bin 14716928 -> 14733312 bytes .../test_crm/tests/TestAuditInheritance.java | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Audit trail.mpr b/Audit trail.mpr index 934dda6ba29e82b8185ec17e0b10b46000accb6c..7b748e1b9a6a22a1b62696851193a441b4f14b44 100644 GIT binary patch delta 1414 zcmY+Edr*{B7{w&{JUG0W~59UZ2#c-O3T6JgbI zR7|e5Y+PBKd75qV;!?|kyzKOZ%<*Yst>py^C)$b=Mx>?AFSnG=Et+C4%T0PP&RJ0{ zdurSiOixe-l~oUVf!?4G=nEP^Kd=w@7}yu|2OkIffdOEDZ~!dFj3XBGafid84FcyphM}YC*NH76R1V@2Sflq_afX{-@fl1(K zFc};Jjs?eo&x0x8crX=A1Jl6_Z~{0H%mgQaMlcJ^1}B44z^Pykm<#5CFM!j)>EMgt z3~(km3(N;+gC@`n7J!9d5oiI6!8zbua2_}xTmY7UR&XKs61WJofu&#>xEL%4?cfq{ zDflwD3|tOYfGfaC@D;EMtOjeqmEbDS0RmhN)`DxmSHU`PE%+MvI=BubSP#Adt_L@O zZ-N^^0XBe}z|G(ma4WbC+z##l8^N96E^s%v2iyz31vY`r;6CteumyYvYz5y1_k#z( z_rQZ-8+Zt82M>cz@CbMm>;T^fkAcU*6JRI!0q6oh1U~{l20sB$f~UaK;2H2N_$hb} zJP&q(7r@WJi{K^jGWa=o1^fd161)mt1FwTOz;5s+_!W3dr*xuTX-7%KPU!9@#;lfO zoEKKf!}Ox_&JCRisg>h}G7r1dTjQNyXUk2!t?MOjM|y=hTXSSLtvcRUw9Sw+4NgVH z5GyGYC~4xPW;fwGQ@$yt{#F?1)XkDltAaKuC+^`HDUw0iNXDcU_G!)gQW_4OO{oa1 z6Si7?e_^o8iK6kkyFqxnd3uX&m3rL}W4X1!QmTk1^iK7^3NbYY&iVgkp4c$b^N);} z%Sj^CqdQ*s_E$%#{6&4GzOOdLQmEu5iVOMj3H1t{ST|d?Y4>%tZZH~?#iByF*l9D# zchwr@&v51z%5zkqnvqhI>c5zlQ%xaZ=XF_*@zYDz4~5BC||DzIz&+J)n z>D#O|^&O3uHoJ-+QT-T`dMYIU_@s7Q$KTCXU0g3!(A1)P9c{OkWH`PHas=#5y7-8y z=gF1w2vxEOriqN0kL!8%&&FFc|))OnVrK!}YO%Qtv zRim|P^Tp3_U3_r=fIBlkCm}OGJHcAzVq;>;M`Pa0ZQ3ysn-zpXBn)E1ATA8z!=OYM zlnjG}Fer5_h!&(q^70P6e%hrdB`sQ7trh(Tp-h(aon=p!{u?&{Qa#$WKU`0&CN>~}IU{y@QYFHg>U`?!rwXqJ?#SgF^*2f0e5F6o# z*ch8&Q*4IKu?4ooR@fSou?@DxcGw<2!VdT`cEnEj33kRV*cCs;ZkU3fVR!6-J+T+| z#y;2=`(b|^fCKS!`~nAIDyHF=I2gaeAvhF=VLA@S5jYY@;bv02a#7&ron{f;Ng1_Q#xD~hI@0gE&;C3v)KXC`{ z#9g=>|H3`E7x&?QJb(xB5FW-OScpgQ7#_zWJb@?i6rRR2coxs$dAxuZ@e*FfD|i)) u@fu#ozwrkCgE#RO-o`ulFaC#j@gCmC2lx>G$4B@WpWst`hR^W@zI+Sa)M(ED diff --git a/javasource/test_crm/tests/TestAuditInheritance.java b/javasource/test_crm/tests/TestAuditInheritance.java index 175f944..22329cd 100644 --- a/javasource/test_crm/tests/TestAuditInheritance.java +++ b/javasource/test_crm/tests/TestAuditInheritance.java @@ -15,8 +15,10 @@ import test_crm.tests.actual.ActualLog; import test_crm.tests.expected.ExpectedLog; -import static test_crm.proxies.Company.MemberNames.Name; import static test_crm.proxies.Company.MemberNames.CompanyNr; +import static test_crm.proxies.Company.MemberNames.Dec; +import static test_crm.proxies.Company.MemberNames.Name; +import static test_crm.proxies.Company.MemberNames.Number; import static test_crm.proxies.Company.MemberNames.InternNr; import static test_crm.proxies.Company.MemberNames.Company_Group; @@ -50,12 +52,14 @@ public void testChangeRecord() throws CoreException { final Company company = createBaseCompany(); company.setName(NAME2); + company.setDec(new java.math.BigDecimal("0.00000000")); // should not be considered changed company.commit(); // Assert log was created final ExpectedLog expectedLog = createExpectedLog(TypeOfLog.Change, company).changeAttribute(Name, NAME, NAME2); final ActualLog actualLog = ActualLog.getLastLog(context, company.getMendixObject().getId().toLong()); + expectedLog.verify(actualLog); } @@ -170,11 +174,13 @@ private ExpectedLog createExpectedLog(final TypeOfLog typeOfLog, final Company c return new ExpectedLog(typeOfLog, Company.entityName, admin, initialDate, Company.entityName) .addAttribute(Name, NAME).addAttribute(CompanyNr, COMPANY_NR) .addAttribute(InternNr, company.getInternNr()) + .addAttribute(Dec, 0).addAttribute(Number, 0) .addReferences(Company_Group, context, MemberType.ReferenceSet, groupObjects); } else { return new ExpectedLog(typeOfLog, Company.entityName, admin, initialDate, Company.entityName) .keepAttribute(Name, NAME).keepAttribute(CompanyNr, COMPANY_NR) .keepAttribute(InternNr, company.getInternNr()) + .keepAttribute(Dec, 0).keepAttribute(Number, 0) .keepReferences(Company_Group, context, MemberType.ReferenceSet, groupObjects); } }