From b14169a2b7bfcaecaa0f5ea9baafad4e7e4f1ae2 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 23 Nov 2016 11:41:11 +0500
Subject: [PATCH] - Pass client timezone to excel template - Templates: adjust
 timezone, use "https" in links

---
 .../traccar/api/resource/ReportResource.java  |  12 ++++--------
 src/org/traccar/helper/DateUtil.java          |   6 ++++++
 src/org/traccar/reports/Events.java           |   9 +++++++--
 src/org/traccar/reports/Route.java            |  10 ++++++++--
 src/org/traccar/reports/Summary.java          |   9 +++++++--
 src/org/traccar/reports/Trips.java            |   9 +++++++--
 templates/export/events.xlsx                  | Bin 12307 -> 12346 bytes
 templates/export/route.xlsx                   | Bin 12806 -> 13042 bytes
 templates/export/summary.xlsx                 | Bin 12330 -> 12315 bytes
 templates/export/trips.xlsx                   | Bin 13161 -> 13197 bytes
 10 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/org/traccar/api/resource/ReportResource.java b/src/org/traccar/api/resource/ReportResource.java
index 2717fe01e..e8e80fa2f 100644
--- a/src/org/traccar/api/resource/ReportResource.java
+++ b/src/org/traccar/api/resource/ReportResource.java
@@ -50,8 +50,7 @@ public class ReportResource extends BaseResource {
             @QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
             @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException, IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        Route.getExcel(stream, getUserId(), deviceIds, groupIds,
-                    DateUtil.parseDate(from), DateUtil.parseDate(to));
+        Route.getExcel(stream, getUserId(), deviceIds, groupIds, from, to);
 
         return Response.ok(stream.toByteArray())
                 .header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_XLSX).build();
@@ -76,8 +75,7 @@ public class ReportResource extends BaseResource {
             @QueryParam("type") final List<String> types,
             @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException, IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        Events.getExcel(stream, getUserId(), deviceIds, groupIds, types,
-                    DateUtil.parseDate(from), DateUtil.parseDate(to));
+        Events.getExcel(stream, getUserId(), deviceIds, groupIds, types, from, to);
 
         return Response.ok(stream.toByteArray())
                 .header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_XLSX).build();
@@ -100,8 +98,7 @@ public class ReportResource extends BaseResource {
             @QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
             @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException, IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        Summary.getExcel(stream, getUserId(), deviceIds, groupIds,
-                    DateUtil.parseDate(from), DateUtil.parseDate(to));
+        Summary.getExcel(stream, getUserId(), deviceIds, groupIds, from, to);
 
         return Response.ok(stream.toByteArray())
                 .header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_XLSX).build();
@@ -124,8 +121,7 @@ public class ReportResource extends BaseResource {
             @QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
             @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException, IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        Trips.getExcel(stream, getUserId(), deviceIds, groupIds,
-                    DateUtil.parseDate(from), DateUtil.parseDate(to));
+        Trips.getExcel(stream, getUserId(), deviceIds, groupIds, from, to);
 
         return Response.ok(stream.toByteArray())
                 .header(HttpHeaders.CONTENT_DISPOSITION, CONTENT_DISPOSITION_VALUE_XLSX).build();
diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java
index ad8534eb8..840f37a7a 100644
--- a/src/org/traccar/helper/DateUtil.java
+++ b/src/org/traccar/helper/DateUtil.java
@@ -18,12 +18,14 @@ package org.traccar.helper;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
 
 public final class DateUtil {
 
     private static final DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.dateTime();
+    private static final DateTimeFormatter DATE_FORMAT_NOMILLIS = ISODateTimeFormat.dateTimeNoMillis();
 
     private DateUtil() {
     }
@@ -64,4 +66,8 @@ public final class DateUtil {
         return DATE_FORMAT.parseDateTime(value).toDate();
     }
 
+    public static DateTime parseDateTime(String value) {
+        return DATE_FORMAT_NOMILLIS.withOffsetParsed().parseDateTime(value);
+    }
+
 }
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 9d82b97a5..ada1580d9 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import org.joda.time.DateTime;
 import org.jxls.area.Area;
 import org.jxls.builder.xls.XlsCommentAreaBuilder;
 import org.jxls.common.CellRef;
@@ -36,6 +37,7 @@ import org.jxls.transform.Transformer;
 import org.jxls.transform.poi.PoiTransformer;
 import org.jxls.util.TransformerFactory;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Geofence;
@@ -68,13 +70,15 @@ public final class Events {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Collection<String> types, Date from, Date to) throws SQLException, IOException {
+            Collection<String> types, String fromString, String toString) throws SQLException, IOException {
         ArrayList<DeviceReport> devicesEvents = new ArrayList<>();
         ArrayList<String> sheetNames = new ArrayList<>();
+        DateTime from = DateUtil.parseDateTime(fromString);
+        DateTime to = DateUtil.parseDateTime(toString);
         HashMap<Long, String> geofenceNames = new HashMap<>();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            Collection<Event> events = Context.getDataManager().getEvents(deviceId, from, to);
+            Collection<Event> events = Context.getDataManager().getEvents(deviceId, from.toDate(), to.toDate());
             boolean all = types.isEmpty() || types.contains(Event.ALL_EVENTS);
             for (Iterator<Event> iterator = events.iterator(); iterator.hasNext();) {
                 Event event = iterator.next();
@@ -118,6 +122,7 @@ public final class Events {
             jxlsContext.putVar("to", to);
             jxlsContext.putVar("distanceUnit", ReportUtils.getDistanceUnit(userId));
             jxlsContext.putVar("speedUnit", ReportUtils.getSpeedUnit(userId));
+            jxlsContext.putVar("timezone", from.getZone());
             jxlsContext.putVar("bracketsRegex", "[\\{\\}\"]");
             Transformer transformer = TransformerFactory.createTransformer(inputStream, outputStream);
             List<Area> xlsAreas = new XlsCommentAreaBuilder(transformer).build();
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index b29e04b2e..f438c8f4d 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import org.joda.time.DateTime;
 import org.jxls.area.Area;
 import org.jxls.builder.xls.XlsCommentAreaBuilder;
 import org.jxls.common.CellRef;
@@ -34,6 +35,7 @@ import org.jxls.transform.Transformer;
 import org.jxls.transform.poi.PoiTransformer;
 import org.jxls.util.TransformerFactory;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
 import org.traccar.model.Position;
@@ -56,12 +58,15 @@ public final class Route {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Date from, Date to) throws SQLException, IOException {
+            String fromString, String toString) throws SQLException, IOException {
         ArrayList<DeviceReport> devicesRoutes = new ArrayList<>();
         ArrayList<String> sheetNames = new ArrayList<>();
+        DateTime from = DateUtil.parseDateTime(fromString);
+        DateTime to = DateUtil.parseDateTime(toString);
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            Collection<Position> positions = Context.getDataManager().getPositions(deviceId, from, to);
+            Collection<Position> positions = Context.getDataManager()
+                    .getPositions(deviceId, from.toDate(), to.toDate());
             DeviceReport deviceRoutes = new DeviceReport();
             Device device = Context.getIdentityManager().getDeviceById(deviceId);
             deviceRoutes.setDeviceName(device.getName());
@@ -85,6 +90,7 @@ public final class Route {
             jxlsContext.putVar("to", to);
             jxlsContext.putVar("distanceUnit", ReportUtils.getDistanceUnit(userId));
             jxlsContext.putVar("speedUnit", ReportUtils.getSpeedUnit(userId));
+            jxlsContext.putVar("timezone", from.getZone());
             jxlsContext.putVar("bracketsRegex", "[\\{\\}\"]");
             Transformer transformer = TransformerFactory.createTransformer(inputStream, outputStream);
             List<Area> xlsAreas = new XlsCommentAreaBuilder(transformer).build();
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 95a3737a1..d7d8ab417 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -25,9 +25,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 
+import org.joda.time.DateTime;
 import org.jxls.transform.poi.PoiTransformer;
 import org.jxls.util.JxlsHelper;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Position;
 import org.traccar.reports.model.SummaryReport;
 
@@ -82,8 +84,10 @@ public final class Summary {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Date from, Date to) throws SQLException, IOException {
-        Collection<SummaryReport> summaries = getObjects(userId, deviceIds, groupIds, from, to);
+            String fromString, String toString) throws SQLException, IOException {
+        DateTime from = DateUtil.parseDateTime(fromString);
+        DateTime to = DateUtil.parseDateTime(toString);
+        Collection<SummaryReport> summaries = getObjects(userId, deviceIds, groupIds, from.toDate(), to.toDate());
         String templatePath = Context.getConfig().getString("report.templatesPath",
                 "templates/export/");
         try (InputStream inputStream = new FileInputStream(templatePath + "/summary.xlsx")) {
@@ -93,6 +97,7 @@ public final class Summary {
             jxlsContext.putVar("to", to);
             jxlsContext.putVar("distanceUnit", ReportUtils.getDistanceUnit(userId));
             jxlsContext.putVar("speedUnit", ReportUtils.getSpeedUnit(userId));
+            jxlsContext.putVar("timezone", from.getZone());
             JxlsHelper.getInstance().setUseFastFormulaProcessor(false)
                     .processTemplate(inputStream, outputStream, jxlsContext);
         }
diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index 91a080d45..c31eaac83 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import org.joda.time.DateTime;
 import org.jxls.area.Area;
 import org.jxls.builder.xls.XlsCommentAreaBuilder;
 import org.jxls.common.CellRef;
@@ -34,6 +35,7 @@ import org.jxls.transform.Transformer;
 import org.jxls.transform.poi.PoiTransformer;
 import org.jxls.util.TransformerFactory;
 import org.traccar.Context;
+import org.traccar.helper.DateUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
 import org.traccar.model.Position;
@@ -175,12 +177,14 @@ public final class Trips {
 
     public static void getExcel(OutputStream outputStream,
             long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
-            Date from, Date to) throws SQLException, IOException {
+            String fromString, String toString) throws SQLException, IOException {
         ArrayList<DeviceReport> devicesTrips = new ArrayList<>();
         ArrayList<String> sheetNames = new ArrayList<>();
+        DateTime from = DateUtil.parseDateTime(fromString);
+        DateTime to = DateUtil.parseDateTime(toString);
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            Collection<TripReport> trips = detectTrips(deviceId, from, to);
+            Collection<TripReport> trips = detectTrips(deviceId, from.toDate(), to.toDate());
             DeviceReport deviceTrips = new DeviceReport();
             Device device = Context.getIdentityManager().getDeviceById(deviceId);
             deviceTrips.setDeviceName(device.getName());
@@ -204,6 +208,7 @@ public final class Trips {
             jxlsContext.putVar("to", to);
             jxlsContext.putVar("distanceUnit", ReportUtils.getDistanceUnit(userId));
             jxlsContext.putVar("speedUnit", ReportUtils.getSpeedUnit(userId));
+            jxlsContext.putVar("timezone", from.getZone());
             Transformer transformer = TransformerFactory.createTransformer(inputStream, outputStream);
             List<Area> xlsAreas = new XlsCommentAreaBuilder(transformer).build();
             for (Area xlsArea : xlsAreas) {
diff --git a/templates/export/events.xlsx b/templates/export/events.xlsx
index f0ff05a23ff9c9907b6508ad93e0d8db11620a70..80a54fa57e81916ef5b80184249fae4a93496e46 100644
GIT binary patch
delta 2680
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

delta 2657
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
PG?Ni9BL)gA00000+&j{3

diff --git a/templates/export/route.xlsx b/templates/export/route.xlsx
index 24027523d91530a2c264778d17bca85630be679f..79a2649b71c59f144b9ed58ede560ac4878dcfcc 100644
GIT binary patch
delta 4873
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

delta 4611
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

diff --git a/templates/export/summary.xlsx b/templates/export/summary.xlsx
index 88788f82ac15c7ba225bc77f0f298f5eb98f608e..53539ed8b90c0a4fdf93f08e7a48f70830ae0616 100644
GIT binary patch
delta 2032
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
OlL0Uz1`;d)0000K8pb#P

delta 2043
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
ZUoTVv(37+;JpoCR@-HI>AuIp@004s^)<pmS

diff --git a/templates/export/trips.xlsx b/templates/export/trips.xlsx
index 83d22678e7ad00283ee9133328d0b6b77937f814..20130f44a4e8b9c7a86c4ed457b3c5a40c565be5 100644
GIT binary patch
delta 2547
zcmV<P2@Lk>W{qdCXA24%_hVwM0ssIy2$OLO8h^Z1%~IPi5WaV&@1RjbCoUkzp$Q?4
zlVM6J2k3MP9D3BmO5(<njI<_Drticv@MK*%h7#KuIxTGuNxVOw^nJVD9gMDILN0}|
zu~s1sSc?*&#yX1CG^FQehub|$EN~U^L@N=}YhmeV`0~ZTS|FIKY)EGSY2WwlcqSyb
zOn;|Bp=Y9v<baQ6>f6)^9@&`?AQQjcYIS|dV@1hWX9_~v?oyJe_#zYU9}L5RjfVpm
zei5lQK;SwR{ecg|f$!`~-<gS1TQ(ku%XnOkZQMk;gDrnPaVdV3Q$HG=rIk}2GN;a6
zoA_CnSVxu2Q{V>5hvY`GA4Nvk%H=<(sDB)frghN=nc;wyE2kU_HHBG4Eu9jZ3Q;*>
z9~*#AMZNPB%L(K#6G<7baRaD7i;7G5z3$tV`><9;Sd=h!Z8R3=Dh4JlGM?Bbl`-|m
zh)~Lw-O{8RESL~9Z;>T-kwxARgvGvT2RplgNBX1|PptuT_BDu|oxQ!zu0t%}Vt+2z
z<OE&~zg*ZAa&tMWWjB}p>>gS2E7Vs+$S+{MPTSq1iX_u|Bxf&ZtpEj`)^4wsk}AhP
z9~HiAqUWJg0s9R~k8|p1<qd`6DsatQQ^JYSl7T+OKs9aBulQjnCoGD{(NSN@zO~fb
zq-2}WP0&vT*5E6#Xi^-9?3<1_gMU~GcECZL;h+1m;5%Z#8L+JQ{T*kn_is)TD*F3#
zGKdp4!^v!tSk0S{-XOOVEG~t`Vv#Qd3&st9p62^tBohwdM$nkN<}!UJakqpU?Z)I4
z282P^cOKsvR&+V$P;`4P)3H`w@jMlfPt{_mHa!xCL}f`*8ZHQXce_O#@+{r$Q`q<_
zE?dUcq(H9gtN$hfmh6`V?qNj$ToZppzYg`DI{Ipe`?&juKLL{=2^6y}4z~^k$eg<E
zN|WgvC4XI$qBs<W@3(6I1I7Kwhp1?&Q!^?b7dthzy}S1jqf!Hg1#G+L*Ut%w5KfqC
zy)oSnZ$4gfk{q)9{FZ0ND=n*(T~?+uvQ2|t5_U*0r<M8dKfx#8G^(0h4kTk2x-#Es
zWqw}&`N#6c${*F4(%OI)F4f9B*LAV5tSULvoPSg!R?rJPIkGY*HT+witg0v}IW(2>
z%yMmeYUL!on4*P6`A8e=cuW(zWyv+Cms&JZ(u~wF{_30-)xEX1!$a*IN^%3Q_wgu0
z+=?e{dyc1#FHe(_RqR-g5|&$HXu8X}HShV%lSho^r2KI$K0(6;nA@jWTE91TO(Rbh
z@qg*UO0v&jM&2BcB+4j>-u&a^gqGIJLkjPf2ZT}5<I4QvEMjM3TI*#qb^oRGRw;iQ
zHQB$=j3zZbKm?h_PsZ|>gk<y^pZg4$4N=A8WzX0TUOfh(4INcYHQo_P>hzUvXa@4_
z9768@rfc{Uy0zMV)xYm!2$~4{UK$5_B!Abe{+rz*nx4)zbUcCg!e7tg@V=#00ucip
zkKD#g!ZK(AevLfkp%3qsyfx)5J=Euw>DnWIGV!MV?5-C|S1O^DN^drD{fRS~wk-?g
zSSq3XpiNIIp}e;_AI%(lK1Q8`qh^>;N})3u9_Cakp}Z@{gH6t)5Xw$C=p6QfrhjuN
zKj<8$uu(#JS9&AQoy>d(y(0%=L%et!p4`>GI#NqaRTBkUQj_(vWH$qrH_Ta85We|1
z3+QQhs$q_~_6ryDDiBZ&_$q+gf{g&<7Hl!tVGv*tVh~{vE5HIDtr-ZX$IWnY;~xUL
zf|c~TwwKl`ERW>wPADLrT7}bBY+Qswv5UbDg8+jNg9w9I0X@60CLXuT#l5)`K&(qX
zyBh%%GZ^eJ2rvjSh%ks1&@%(C`EfH`+@Cua&7Dxd!foenjOI=#6uSb<+SuJ;MSwww
zL4-l9fSz4gr;n58A0U4td)zJ;_w7!RU7=9zx_D^{iQ-oP#V=L_7=#!^7{m(b`Gtev
zalc%=GP|LE6`&jH1}nB0>@Wy02r-B-h!xN?!}HgN&j>DFnef{#ycwE2UE!lx)fMx;
zVyi10w0rLcBq&CL0SVei!T|}|NTLA=TAuNMq+6f8cg+(w<z0U_DHzmFu2s$QHYxk)
zpysWtO!#dl!NnV-knq%@)1YB*2AV<Un?#eRr)o23>)FY!;MDF8QnaE2sez-e)1bf!
zr3OxrPJ==x8q%QPi3c=p7d^e{;KrWFkGQ(GlAHP}*=S^|k)1{Yjf5JBG!m<%Z|k|V
zPv(7|lK4raqz`|Np8E-+Y`K~y&`79}NF%XI`o^A00UenGs>URmDmkr|<;i-gF)h!N
znr>GQH4<qgR!QI3Q^}qqvpv<AM9QfmRcf{_M5-|@=hJG18i_O#tE6x2sl?BbnV)J*
zBGs6d+sS&WF)h238g<6B{7%!vD(M@0D#hd9**xh{jY)sxE1{@mak8FjOv~e>Mm45o
za+-$USG1d%FeWY$#OGr{PV_HQp3+NYWc1iv3e0SOI(0l}Hg;Wq?9E_Jl;Re_9t}LJ
zS;4OoW}a`49dAChr|x|2@<7?M8cw_4JUqh%7=`Z@do*zz-*IerJat_gx`Y0XjMcw;
z2w$yy)Gr&fz7|G73R=FTKjHQVj)P-bR`qvy`0bkSoBER&A|?$kZ@;={%>-EOt>5|=
zlOPEdvtJ@(1qG)JAJKBN$0sBKe~eN=PQx$|yd&|4$oJH7QVNQaR07l!m5?X`aWnR|
zH6)H@yDj}ao1{%s(E~T{&UiGlyV>-oDuXRpr)r%OHi}39TGUeMRZd<Pv+#}t&T}n!
zS!>A29vqn#*H@V^si-YH+uDHj3S59n+NHweWbM64DRp8E6?Y?KXatwFf33L3(yplC
z;+wC4#!)n(6?iVW=d=+FO|M7}l2Y`NW@F1%Kne;aRG_`1Y{ck^>%ms;;)fO)Fe~Nv
z1~VP(4z;D|z@Gi%R8QRPcB5U=+Ccw|zR#at+Nhz@&8!5FB9kKZ%9l`N^z_7++kAe3
z@Ljtv5D*r)uWbkP1p*SBZm`OD+)xLeHE<6lcYcm5TPl$Ed*oc`Vavi+HES+d%jiqA
z+D@i(05ZU=X*Zc8@|HY2E@q^NBQ^;c3t7B~Ch7P#W${Oo@9ck*y=znlQ~ywmlSVNa
zr#F*<;!&U-XUX+ygGbX1VNm@!#o`yUQ7Rq=3L5ugVyyxI06GYhc`#A|IFrmUPyu(7
z9Wg)wWRqSoAREY>y6s8@0024^000;O000000000000000?~|D^MFDS<-!Vu5d6OtI
zD;uW_AJK9F007ql000pH000000000000000(vxm7J^_1^tuj;r`jY}PJprzhKr<r-
Jgf9R9007k6tvCPx

delta 2541
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