From ee5130f71996a23ae7cea9b5fee8dddab46bd5c3 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Tue, 19 Jun 2018 21:23:34 +0200
Subject: [PATCH] Added button for report dialog to shop.

---
 core/icons/print_48x48.png       | Bin 0 -> 1067 bytes
 core/rc.qrc                      |   1 +
 shop/icons/pos_printer_48x48.png | Bin 0 -> 765 bytes
 shop/paydvouchersdialog.cpp      |  22 ++++++++++++++++++++++
 shop/paydvouchersdialog.h        |   2 ++
 shop/paydvouchersdialog.ui       |  22 +++++++++++++++++++++-
 shop/shop.json                   |   6 +-----
 shop/shoprc.qrc                  |   1 +
 8 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 core/icons/print_48x48.png
 create mode 100644 shop/icons/pos_printer_48x48.png

diff --git a/core/icons/print_48x48.png b/core/icons/print_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..494b84c298c016b1072d312c8e5facd8648a4aac
GIT binary patch
literal 1067
zcmV+`1l0S9P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkR%}GQ-RA_<in9pw;MHI)sGwa=TS|gfL
z8QO@5N>CcLcT{lfB*o!};Ap7IfkPnND)9$Y9D)Rbq(XusAr8pm5TtPG0YL<EQVG-p
zMN#-ASqM_%G$BnPEm_yu?7YXJwd-|lvKwbNSokZ=!Q(e?zn|SVvpWN{)z<%8!cTA_
zk?1rG<FsJDKL|65xiB>~^{SsSz5oVNsV_9cc#nuS{8{s?5{Qm{mCL;mNcR4|zST@7
zqXm*2Kqiwh2KxK|@-s#TWoD~lX7UsNp9Ao#Ho#7+<pCNlqnS*`SYBQ>s{5o63uZKW
zgqc+kW^`TGi<UK`h`Ou$<MFsXF)?A+8&ek`l}bGj(X?3rcLm_nw}|MvZWu==Cnx7?
z|8oH(5{XV-*WVRDQV3Cb+mdF2cc9t?D@eL|<B8~ZDdn`I)T!y|>D6*fq<Vm97#}c@
zVCIVgr~oh|e(8AyPGnbT<_-HA4(30q00=2(Ks2an+F1ZEl;a{b<BkFNL`r!M%+HiN
zSqLm2=!I?U3Bx-8pyS384(79!-%`rA33yHb&sN8|0f>YUg06S=#FQ{#*w?UoZSGbE
zgu7-5+%ZE1GeHPfZ(U1E2OfX$yGPF8*N0woCzK&K52`I806^4QT8%HA$K9(xyHUe@
z0?hz)U;1<ob9`sQRspyYfAk*P+>4IlBKEF)dplv+bHIb@0yyR#v$(4ZQmwla`r7_9
zsb&E7&wq9qTvbBV6F4k2Q$mZ~Pwls&U5Net8}7UO<;~7AL|AGDKwGyQQ~Zg@#+o}}
ztIUD;ALp;QN(k7Q67m317ocInRw<!|30oCFnY%%n7Ak<!bSOQFh`si&ao(N)5e|R-
z4i+DN5`qHRjJd=S9bG@3gCJ+qSWf_E@hbLRx`2I!i=f)c9fX8{rZym*(x#!F=YZyv
z0H=h&j^(zfmOqtfc>wRr=q;JiC=MSwgq|Zux7ElG-_IhS&%?Iso}M(63xK7Z18|aw
z2H`&Y5mHJ?L>sYKEb`XqSRmh}Cr&)irIi&&N~sewfp4!EOmtQQ?gjHt4FRN-Ct0b}
z5TX-8<SXt00`un)DPJ2KJJVgWE!{Saj*f|!UmBWcrQVdlAWK=fkO08I1*O!;mXh}+
zlOK+ckKZ674zgvl*<xRB@B7<zQvd+{$>h_+!^2mDHeYT-LqjVA$z*!l0MhC7?83qV
zhowTHz)u`MKI6rkr&XwASs%YXGIFX|EQWG47wzb<to8Nm=8-;jx#@KJF{M-}?+s>F
lxm@m>Fs{{BTW#&I{sF2fZ$rrTFn$04002ovPDHLkV1k&s<0k+B

literal 0
HcmV?d00001

diff --git a/core/rc.qrc b/core/rc.qrc
index 57d1c12..8f8369f 100644
--- a/core/rc.qrc
+++ b/core/rc.qrc
@@ -40,5 +40,6 @@
         <file>icons/report_24x24.png</file>
         <file>icons/zoomIn_24x24.png</file>
         <file>icons/zoomOut_24x24.png</file>
+        <file>icons/print_48x48.png</file>
     </qresource>
 </RCC>
diff --git a/shop/icons/pos_printer_48x48.png b/shop/icons/pos_printer_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0ba3035eabdc71b78ed76aeaf9816e729fe205d
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkQpGibPRA_<inX!u#K@`Tn$<D5u5OR?d
zlp|P(_Xl`bSOh0m3Epiu)aF1zOA)lO5ep0d6G6@#8oT2lfv^ypv$C<Uv9XYAY;F^i
z>}D;JnA>1>XJ=<OIoS^uLYSHTP2T(7dk`SiVnyOQm@!5bMXR~P!F2$3$n8#skb?}R
zFB^@9<+qTEBhD9NjDl((hRV5WF`L7+jg3(I9mm1vqoXIkd%Y5Xdwy%BM_>Z)=*8-f
zt2=nU{tLIawnCrNY&KEb+jDKlDVU~tGH+cb677sm!?&yZqb~^o5qNUB95DKUb-#B?
zOCiP>C6v}}y=b(n`+y6;9T5-`KG3{7q(oo}zv_WcLXjijg|AKFC(k$~LW^@xqzeSX
zBSH$reF4T8C4|=P?5fc={sI5@5(Gq`*zxWVy1)c}kiTGjGT!;Xk4a){mjV~yhL2c<
zV(~y&_z6gyWt95@6T=R&obab3Ae2KABOnS7Ma4>?Am#ziJ%No(7~Tc0e0u}7xhXVC
z$SR|RWYmw2R@nY};|0zifAQw`Y`%{_>z$ui|6aqx$Ip-<V$EKP2N+`)LFx8NK8L%<
zZ>Nv}x>UN1od-`*T3h495LciF6sM0zyLV77mt%+VNM;!ouH_LVd6W<v2ck%BABcGz
zh@z!UA<3h}8Bd`wjYXbhMqm*h;Cvsy2NF*q*&ax|5Adx^JrJ8x56m8SmObzvj1tLr
zVyPx3WD(;u-@2vsKw3t<XDwnHO+DZ_ZfQLr^*^#jXo*uuf(KMp?YhGuI-O497qF}o
z0B|);>-wz=q^eXZ^{lQNHyNW;QDpJ?%C>EorfK*3{r9a_Yu9gWU<&2)`TLe-y>1*H
v-f{_1<zdbjaoqtF<)GW`zDnYKsiNo)k0bBPM~vA200000NkvXXu0mjfOEOX2

literal 0
HcmV?d00001

diff --git a/shop/paydvouchersdialog.cpp b/shop/paydvouchersdialog.cpp
index 5819e60..a326c36 100644
--- a/shop/paydvouchersdialog.cpp
+++ b/shop/paydvouchersdialog.cpp
@@ -8,6 +8,9 @@
 #include "shopservice.h"
 #include "eetbatchdialog.h"
 
+#include <reporting/reportdialog.h>
+#include <reporting/variablefiller.h>
+
 #include "shop-odb.hxx"
 
 PaydVouchersDialog::PaydVouchersDialog(QWidget *parent) :
@@ -140,3 +143,22 @@ void PaydVouchersDialog::on_btnSendEet_clicked()
         dialog->addLog((msg.isEmpty() && !sent) ? "\n" : ": " + msg);
     }
 }
+
+void PaydVouchersDialog::on_btnReports_clicked()
+{
+    QSharedPointer<Voucher> voucher;
+
+    if (ui->tableVouchers->currentIndex().isValid())
+    {
+        voucher= m_voucherModel->itemFromIndex(ui->tableVouchers->currentIndex());
+    }
+
+    ReportDialog *dialog = new ReportDialog(!voucher.isNull(), this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    VariableFiller varFiller;
+
+    varFiller.fillList(Context::instance().plugin("SHOP")->reports(), voucher.isNull() ? 0 : voucher->id());
+
+    dialog->setReports(Context::instance().plugin("SHOP")->reports());
+    dialog->show();
+}
diff --git a/shop/paydvouchersdialog.h b/shop/paydvouchersdialog.h
index 9c8f5bf..b033951 100644
--- a/shop/paydvouchersdialog.h
+++ b/shop/paydvouchersdialog.h
@@ -28,6 +28,8 @@ private slots:
 
     void on_btnSendEet_clicked();
 
+    void on_btnReports_clicked();
+
 private:
     Ui::PaydVouchersDialog *ui;
 
diff --git a/shop/paydvouchersdialog.ui b/shop/paydvouchersdialog.ui
index 44186d9..397137b 100644
--- a/shop/paydvouchersdialog.ui
+++ b/shop/paydvouchersdialog.ui
@@ -31,9 +31,29 @@
         <property name="text">
          <string/>
         </property>
+        <property name="icon">
+         <iconset resource="shoprc.qrc">
+          <normaloff>:/icons/pos_printer_48x48.png</normaloff>:/icons/pos_printer_48x48.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>32</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="btnReports">
+        <property name="text">
+         <string>...</string>
+        </property>
         <property name="icon">
          <iconset resource="../core/rc.qrc">
-          <normaloff>:/icons/print.svg</normaloff>:/icons/print.svg</iconset>
+          <normaloff>:/icons/print_48x48.png</normaloff>:/icons/print_48x48.png</iconset>
         </property>
         <property name="iconSize">
          <size>
diff --git a/shop/shop.json b/shop/shop.json
index baad1ce..29306c7 100644
--- a/shop/shop.json
+++ b/shop/shop.json
@@ -116,9 +116,5 @@ ALTER TABLE Voucher ADD \"updated\" TEXT NULL;
             "saveDateTime" : "Datum uložení",
             "insertDate" : "Datum vložení"
         }
-    },
-    "reports" : [
-        { "name" : "Zaplacené účtenky", "description" : "Všechny zaplacené účtenky", "listReport" : 1, "file" : "vouchers.lrxml" },
-        { "name" : "Nezplacené účtenky", "description" : "Všechny nezaplacené účtenky", "listReport" : 1, "file" : "vouchers_n.lrxml" }
-    ]
+    }
 }
diff --git a/shop/shoprc.qrc b/shop/shoprc.qrc
index e28635d..ddc3752 100644
--- a/shop/shoprc.qrc
+++ b/shop/shoprc.qrc
@@ -8,5 +8,6 @@
         <file>icons/sendEet.svg</file>
         <file>icons/pay_24x24.png</file>
         <file>icons/shop_64x64.png</file>
+        <file>icons/pos_printer_48x48.png</file>
     </qresource>
 </RCC>