From 5bbb7b9708b3804d93c2a9623ff05616e9890f22 Mon Sep 17 00:00:00 2001 From: emtunhei <emtunhei@stud.ntnu.no> Date: Mon, 4 Apr 2022 15:12:11 +0200 Subject: [PATCH] Combined searching data from multiple sawmills --- src/main/java/com/application/DB/DB.java | 1 - .../com/application/DB/Constants.class | Bin 1674 -> 5208 bytes target/classes/com/application/DB/DB.class | Bin 15877 -> 15877 bytes .../GUI/LineChartFunctionality.class | Bin 4505 -> 4505 bytes 4 files changed, 1 deletion(-) diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java index 3116ced..f56c9db 100644 --- a/src/main/java/com/application/DB/DB.java +++ b/src/main/java/com/application/DB/DB.java @@ -272,7 +272,6 @@ public class DB { * @return the results * @throws Exception returns potential error */ - public static Map<Integer, Map<String, Number>> getKwh(Map<String, String> dates, int locationID, String kwhTableName, String KwhName, String timestamp, String valueIDName, diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class index a8e88ad82c3a058c24d18c8c9e69908098dfe753..091a895c5cc5d2a74b30a21bae9762ebf5626ea0 100644 GIT binary patch literal 5208 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 delta 997 zcmcbi(Zw5g>ff$?3=9k=3@Ka;0t}8E3{G4O&I~S`4EzkPTnugu?jWuQi0jG0;02<+ zL4*&8@C6ZmAi^I+1h6v%vNHrRGO(rP7v(0FFfyo2{?4s7@p^B4Fe3xEkH52Hh^N0_ zyr&B@0|P@1BZEkYqmz$oyq}}5YkZiakFR5hr*kj|LkJ@SACioBxCaMAC?f+uSY3c) zkfX0-h-*+V2SXSmgJ5uoV^B!EOHibzpF7wj4u)_>27%xZ{{Vz&y{{_=Lj)rOm$#>n zryo>VBqIX{gzxFX$iV93>FXK7%)r3>0wf;p0aX<Ra*U_1YjB98Zva#*nvsDw%+V** zHQv(&Dip)WzyT8i`OcV;fz2i}FSEpsk%3ub@-615$z>dxk>(5*j10n+m6esczP`FC zDGDAQR=K%W#l`Flu{;cM4Dmb+f(%0J3<*38i3~{~PBIUJFoOsq0|O6(D1!(OgBXYq z2N4n=LXts>he3xyYVtM?`N<o(^cWQ;|L2sQY{Y3Q#^;=vlU$mUSdy9&T#{b^@>OO| z-sEkZiX7}=i8-aIo-UKubFZ14!ed*{&mh3Sz#z)N0kWQffk6^vDFXuoC&*GTEyf@M zrp2MO1eBI!kOHfhW)NXuWRPKCU|?d9Wsqc$V~~RL<ryRy6p-W<86+8$kod~=43Z2g zNCK)1k_>7{e02s%1`Q;>CW9n{77|~ZffE!6V29`;S**t($)Jy<&VWIZ!4QdW#30FF z%pk&04|BN*gCv6~k^yE6Obkp6<_s1Lj0~0x3=GB$j0}tn3=FJV+Zh-)f<0@+z`(%8 zz{J47z{kMCAi!YF0E#QHA_f}<TLuOO4hB280jXe>3=D=sOgk8uH#4woVqn?95XHKU zfo(GbyAa1_22K#c1tPdX1P{w*240TM416Hl7#TpeDKT(>?ce}Mk{E*|gE)g6g9L*z TIFw`=bQla67#Zxru5$nYTV;&4 diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class index ec94bb2562c0057e24be6028107eec5cfcf34df4..b45465c0d555e36620039dc871257a81d7669b96 100644 GIT binary patch delta 332 zcmZpzX|36?-n3qlfs;|1L5ESE!IV*%p^;IQVJ@Q@!#zeFhG&fW3~w2Y7(Or>GYT=9 zF^V&qGuklPFs3ltGj=mNGR|OhVVuk8#<+&jn{hp(FXK5zf5w}P0gUe%0~!A@1~D-* zhA^=(hA}BKMl$I!#xMmj#xfN%#xa#KCNOMgU|_hyAj+7sS<mc0OMMvwCu0=@FJm=> z5@QX624gLQCu2QB0AnLVFk>5|3gaY39meU5#*DKWLmB5WMl#N4jAdNNn9I0|v5IjW zV;kdo#y-Z4jI$XJGR|Y%%(#GY2jf=8U5rN<_b{Gi+{gHaaX;gG#siH17|$|sF`i=* zV!Xg4&v=hXiSZ(n3gZ<fODo1}OdgCkm;xDZF%>Z0W-4a9!_>t1glQ7vGp2crFPRoH kzF}I!_>O4{;|Hc2j31ePGJazE!}x_+jPb|jXV&se03)<mbN~PV delta 332 zcmZpzX|36?-n3qpfs;|5L5ES9!IV**p^;IOVJ@Q<!#zd=hG&e%3~w3D7(OtXGYT<U zF^V%<GukjZFs3j%Gj=n&GR|Q1V4Tb7#khvipK(27Amcg4V8)w_A&l=CLmB@uhA}ZR zMli83MlmTf#xm(KCNKptCNdQ>CNY&UrZ8-0U|_hyAj+7sS<mc0OMMjsCu1E0FJnD} z5@Q2{24f?GCu1{10AnjdFk=^^3ga|J9md&=#*FhBLm3w_MlvpDjAdNPn9I11v5IjM zV;kdU#y-ZajI$Y!GR|Y%&bWYa593zGeT+vK4=|o(JjD2h@i60i#v_dX7%wt$F<xR4 zV!Xm6&-jQ*iSa6v3gZnXODo1(OdgDPm;xE^F%>Z0XDViVz|_R}f@u=tE2epjZ<!V{ keqdU|_=#x?;}@nIj9;04GJa$F!}x<)jPcLrXV&se0O;IVr~m)} diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 6f28f534a0484a9e319c2585678a0b527fd50c78..dd012d8d671c613e50c4af95d932546655503bb0 100644 GIT binary patch delta 116 zcmbQKJX3kY3O+*%22%!01`7r&h6n~5hIj^Bh71NfhCBv)hH?g1hRF<W4AU6g8D=tg zFwA4{WLU`HwfQFBbVkD<26={H22F-A1|x=Wh9HJWhDe4eh9rh)h75)nhC+rUhAxH_ VhF*qLhDi)*3{x4>CodHE0RWph8NmPm delta 116 zcmbQKJX3kY3O++i22%zr1`7sjh6n~*hIj@$h71OKhCBubhH?fshRF=>4AU4q7-lkf zGR$M}Vpz!Fz4<2JbVkEq26=`M22F-=1|x<Dh9HJ0hDe5Jh9rg<h75*ShC+s9hAxIw VhF*p=hDi+R3{x30CNC8D0RW)(8QTB= -- GitLab