0002064-avanzamento-tecnologico-e-pulizia-sorgenti #1

Merged
f.disciascio merged 12 commits from 0002064-avanzamento-tecnologico-e-pulizia-sorgenti into dev 2024-11-05 08:04:31 +00:00
3 changed files with 162 additions and 114 deletions
Showing only changes of commit 434ffc2bca - Show all commits

View File

@ -51,8 +51,9 @@
<display>
<larghezza>1024</larghezza>
<altezza>700</altezza>
<fontSize>20</fontSize>
<fontSize>15</fontSize>
<altezzaControlli>150</altezzaControlli>
<altBarraApplicazioni>40</altBarraApplicazioni>
<larghezzaControlli>150</larghezzaControlli>
<TastieraVideo>SI</TastieraVideo>
</display>

View File

@ -121,21 +121,21 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<Component id="subPnlTessera" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel2" max="32767" attributes="0"/>
<Component id="subPnlCliente" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" max="32767" attributes="0"/>
<Component id="jPanel2" alignment="1" max="32767" attributes="0"/>
<Component id="subPnlTessera" max="32767" attributes="0"/>
<Component id="subPnlCliente" alignment="1" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel1">
<Container class="javax.swing.JPanel" name="subPnlTessera">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@ -173,7 +173,7 @@
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="lblResiduo" pref="140" max="32767" attributes="0"/>
<Component id="lblTipoPagamento" max="32767" attributes="0"/>
<Component id="lblGratuità" alignment="0" pref="140" max="32767" attributes="0"/>
<Component id="lblGratuita" alignment="0" pref="140" max="32767" attributes="0"/>
</Group>
</Group>
<Component id="btnImpostaCliente" alignment="0" pref="252" max="32767" attributes="0"/>
@ -225,7 +225,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblCodice5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblGratuità" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblGratuita" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
@ -357,7 +357,7 @@
<Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Gtratuit&#xe0; Residue:"/>
</AccessibilityProperties>
</Component>
<Component class="javax.swing.JLabel" name="lblGratuit&#xe0;">
<Component class="javax.swing.JLabel" name="lblGratuita">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="1"/>
@ -367,7 +367,7 @@
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel2">
<Container class="javax.swing.JPanel" name="subPnlCliente">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@ -736,11 +736,6 @@
</Events>
</Component>
<Component class="javax.swing.JButton" name="jbtnStampa">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jbtnStampaActionPerformed"/>
</Events>

View File

@ -67,8 +67,9 @@ public class PuntoCassa extends JFrame implements ActionListener {
public static String dbPassword = "";
private String utenteLoggato = "";
private String imgPath = "";// "L:\\Lavoro\\Goffredo\\risorse\\";
private int displayWidth = 1024;
private int displayWidth = 1024;
private int displayHeight = 768;
private int altezzaBarraApplicazioni = 0;
private Long progressivo = 0L;
private Long progressivoTurno = 0L;
private Long progressivoGiorno = 0L;
@ -139,6 +140,10 @@ public class PuntoCassa extends JFrame implements ActionListener {
private static Boolean asporto = false;
private static Boolean flagPrecaricaLista = false;
//delta per la grafica (in px)
private int deltaWidth = 14;
private int deltaHeight = 7;
// ==========================================================================
// *** Constructor della classe PuntoCassa
@ -275,6 +280,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
Element p = (Element) display;
displayWidth = Integer.parseInt(p.getElementsByTagName("larghezza").item(0).getFirstChild().getNodeValue());
displayHeight = Integer.parseInt(p.getElementsByTagName("altezza").item(0).getFirstChild().getNodeValue());
altezzaBarraApplicazioni = Integer.parseInt(p.getElementsByTagName("altBarraApplicazioni").item(0).getFirstChild().getNodeValue());
hFont = Integer.parseInt(p.getElementsByTagName("fontSize").item(0).getFirstChild().getNodeValue());
altControlli = Integer.parseInt(p.getElementsByTagName("altezzaControlli").item(0).getFirstChild().getNodeValue());
largControlli = Integer.parseInt(p.getElementsByTagName("larghezzaControlli").item(0).getFirstChild().getNodeValue());
@ -299,6 +305,19 @@ public class PuntoCassa extends JFrame implements ActionListener {
jTxtTessera.setFont(f);
jChLogin.setFont(f);
jBtnReadCard.setVisible(false);
Font newFontBtnAnnulla = new Font(jbtnAnnulla.getFont().getName(), jbtnAnnulla.getFont().getStyle(), hFont);
jbtnAnnulla.setFont(newFontBtnAnnulla);
Font newFontBtnDuplica = new Font(jbtnDuplica.getFont().getName(), jbtnDuplica.getFont().getStyle(), hFont);
jbtnDuplica.setFont(newFontBtnDuplica);
Font newFontBtnElimina = new Font(jbtnElimina.getFont().getName(), jbtnElimina.getFont().getStyle(), hFont);
jbtnElimina.setFont(newFontBtnElimina);
Font newFontBtnChiudi = new Font(jbtnChiudi.getFont().getName(), jbtnChiudi.getFont().getStyle(), hFont);
jbtnChiudi.setFont(newFontBtnChiudi);
Font newFontTxtTotaleCassa = new Font(txtTotaleCassa.getFont().getName(), txtTotaleCassa.getFont().getStyle(), (hFont + (hFont / 10 * 3)));
txtTotaleCassa.setFont(newFontTxtTotaleCassa);
Font newFontTxtTotalePunti = new Font(txtTotalePunti.getFont().getName(), txtTotalePunti.getFont().getStyle(), (hFont + (hFont / 10 * 3)));
txtTotalePunti.setFont(newFontTxtTotalePunti);
// --------------------------------------------------------------------
// ** ID_PUNTO_CASSA
// --------------------------------------------------------------------
@ -658,7 +677,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
lblMessaggioErrore = new javax.swing.JLabel();
pnlTop = new javax.swing.JPanel();
pnlCliente = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel();
subPnlTessera = new javax.swing.JPanel();
lblCodice1 = new javax.swing.JLabel();
lblSaldo = new javax.swing.JLabel();
lblCodice2 = new javax.swing.JLabel();
@ -673,7 +692,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
lblResiduo = new javax.swing.JLabel();
lblCodice5 = new javax.swing.JLabel();
lblGratuita = new javax.swing.JLabel();
jPanel2 = new javax.swing.JPanel();
subPnlCliente = new javax.swing.JPanel();
lblCodice = new javax.swing.JLabel();
lblCategoria = new javax.swing.JLabel();
lblDenominazione = new javax.swing.JLabel();
@ -773,7 +792,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
pnlCliente.setToolTipText("");
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Tessera"));
subPnlTessera.setBorder(javax.swing.BorderFactory.createTitledBorder("Tessera"));
lblCodice1.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
lblCodice1.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
@ -834,48 +853,47 @@ public class PuntoCassa extends JFrame implements ActionListener {
lblGratuita.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
lblGratuita.setText("[...]");
lblGratuita.setName(""); // NOI18N
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
javax.swing.GroupLayout subPnlTesseraLayout = new javax.swing.GroupLayout(subPnlTessera);
subPnlTessera.setLayout(subPnlTesseraLayout);
subPnlTesseraLayout.setHorizontalGroup(
subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(lblCodice2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblCodice1, javax.swing.GroupLayout.DEFAULT_SIZE, 104, Short.MAX_VALUE))
.addGap(8, 8, 8)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblPunti, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblSaldo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(lblCodice3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblCodice4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblCodice5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(lblResiduo, javax.swing.GroupLayout.DEFAULT_SIZE, 140, Short.MAX_VALUE)
.addComponent(lblTipoPagamento, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblGratuita, javax.swing.GroupLayout.DEFAULT_SIZE, 140, Short.MAX_VALUE)))
.addComponent(btnImpostaCliente, javax.swing.GroupLayout.DEFAULT_SIZE, 252, Short.MAX_VALUE)
.addComponent(jTxtTessera)))
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addGap(48, 48, 48)
.addComponent(jBtnReadCard, javax.swing.GroupLayout.PREFERRED_SIZE, 154, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jcmbSC, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
subPnlTesseraLayout.setVerticalGroup(
subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createSequentialGroup()
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(jcmbSC, javax.swing.GroupLayout.PREFERRED_SIZE, 3, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jBtnReadCard, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@ -883,30 +901,30 @@ public class PuntoCassa extends JFrame implements ActionListener {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnImpostaCliente, javax.swing.GroupLayout.PREFERRED_SIZE, 34, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblSaldo)
.addComponent(lblCodice1, javax.swing.GroupLayout.Alignment.TRAILING))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblPunti)
.addComponent(lblCodice2))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblTipoPagamento)
.addComponent(lblCodice3))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblResiduo)
.addComponent(lblCodice4, javax.swing.GroupLayout.Alignment.TRAILING))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlTesseraLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblCodice5)
.addComponent(lblGratuita)))
);
lblCodice5.getAccessibleContext().setAccessibleName("Gtratuità Residue:");
jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Cliente"));
subPnlCliente.setBorder(javax.swing.BorderFactory.createTitledBorder("Cliente"));
lblCodice.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
lblCodice.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
@ -968,12 +986,12 @@ public class PuntoCassa extends JFrame implements ActionListener {
lblFascia.setForeground(new java.awt.Color(255, 0, 0));
lblFascia.setText("[...]");
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
javax.swing.GroupLayout subPnlClienteLayout = new javax.swing.GroupLayout(subPnlCliente);
subPnlCliente.setLayout(subPnlClienteLayout);
subPnlClienteLayout.setHorizontalGroup(
subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(subPnlClienteLayout.createSequentialGroup()
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(lblOrganizzazione5, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblOrganizzazione4, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblOrganizzazione3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -983,7 +1001,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
.addComponent(lblOrganizzazione, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblOrganizzazione1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lblConvenzione, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE)
.addComponent(lblAzienda, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblScadTessera, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -994,39 +1012,39 @@ public class PuntoCassa extends JFrame implements ActionListener {
.addComponent(lblFascia, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGap(0, 0, 0))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
subPnlClienteLayout.setVerticalGroup(
subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, subPnlClienteLayout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblCodice)
.addComponent(lblCategoria))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblDenominazione)
.addComponent(lblCognome))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblNome)
.addComponent(lblOrganizzazione))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblOrganizzazione1)
.addComponent(lblNascita))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblOrganizzazione3)
.addComponent(lblAzienda))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblOrganizzazione4)
.addComponent(lblConvenzione))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblOrganizzazione5)
.addComponent(lblFascia))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(subPnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblOrganizzazione2)
.addComponent(lblScadTessera))
.addGap(6, 6, 6))
@ -1037,14 +1055,14 @@ public class PuntoCassa extends JFrame implements ActionListener {
pnlClienteLayout.setHorizontalGroup(
pnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlClienteLayout.createSequentialGroup()
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(subPnlTessera, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(subPnlCliente, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
pnlClienteLayout.setVerticalGroup(
pnlClienteLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(subPnlTessera, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(subPnlCliente, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
pnlTop.add(pnlCliente);
@ -1481,7 +1499,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
// -----------------------------------------------------------------------
// *** Dimensioni del frame
// -----------------------------------------------------------------------
this.setSize(displayWidth, displayHeight);
this.setSize(displayWidth + deltaWidth, displayHeight + deltaHeight);
tw = this.getWidth();
th = this.getHeight();
@ -1489,23 +1507,39 @@ public class PuntoCassa extends JFrame implements ActionListener {
// *** Posizione della status bar
// -----------------------------------------------------------------------
x = 0;
y = th - 50;
y = th - 60;
w = (tw / 8);
h = 50;
h = 60;
int part = (displayWidth - lblDB.getWidth()) / 7;
lblUtenteLoggato.setLocation(x, y);
lblUtenteLoggato.setSize(w, h);
lblInfo.setLocation(w, y);
lblInfo.setSize(w * 2 + 60 - lblDB.getWidth(), h);
//lblUtenteLoggato.setSize(w, h);
lblUtenteLoggato.setSize(part, h);
//lblInfo.setLocation(w, y);
lblInfo.setLocation(lblUtenteLoggato.getLocation().x + lblUtenteLoggato.getSize().width, y);
//lblInfo.setSize(w * 2 + 60 - lblDB.getWidth(), h);
//lblInfo.setSize(296, h);
lblInfo.setSize((int)(part * 1.5), h);
lblInfo2.setLocation(w * 3 + 60 - lblDB.getWidth(), y);
//lblInfo2.setLocation(w * 3 + 60 - lblDB.getWidth(), y);
lblInfo2.setLocation(lblInfo.getLocation().x + lblInfo.getSize().width, y);
// lblInfo2.setSize(tw - (w * 2 + 10) - 131, h);
int larg = tw - (w * 2 + 10) - 359;
lblInfo2.setSize(larg, h);
//lblInfo2.setSize(larg, h);
//lblInfo2.setSize(444, h);
lblInfo2.setSize(part * 3, h);
lblStatoConnessione.setLocation(tw - 181 - lblDB.getWidth(), y);
lblStatoConnessione.setSize(175, h);
//lblStatoConnessione.setLocation(tw - 181 - lblDB.getWidth(), y);
lblStatoConnessione.setLocation(lblInfo2.getLocation().x + lblInfo2.getSize().width, y);
//lblStatoConnessione.setSize(175, h);
//lblStatoConnessione.setSize(116, h);
lblStatoConnessione.setSize((int)(part * 1.5), h);
lblDB.setLocation(tw - 181 - lblDB.getWidth() + lblStatoConnessione.getWidth(), y);
//lblDB.setLocation(tw - 181 - lblDB.getWidth() + lblStatoConnessione.getWidth(), y);
lblDB.setLocation(lblStatoConnessione.getLocation().x + lblStatoConnessione.getSize().width, y);
//lblDB.setSize(60, h);
// -----------------------------------------------------------------------
// *** Posizione del panel Errore
@ -1535,7 +1569,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
w = tw + 5;
h = th - lblUtenteLoggato.getHeight();
pnlTop.setLocation(x, y);
pnlTop.setSize(w, h);
//pnlTop.setSize(w, h);
pnlTop.setSize(displayWidth, h);
// -----------------------------------------------------------------------
// *** Posizionamento degli oggetti nel panel Top (operativo)
@ -1568,8 +1603,10 @@ public class PuntoCassa extends JFrame implements ActionListener {
// -----------------------------------------------------------------------
x = x + w;
y = 0;
w = tw - x - 10;
h = (int) (25 * th / 100);
//w = tw - x - 10;
w = tw - x;
//h = (int) (25 * th / 100);
h = pnlProdotti.getHeight() / 6 * 2;
pnlLista.setLocation(x, y);
pnlLista.setSize(w, h);
scpLista.setLocation(0, 0);
@ -1599,8 +1636,9 @@ public class PuntoCassa extends JFrame implements ActionListener {
// -----------------------------------------------------------------------
y = h;
pnlLista1.setBorder(javax.swing.BorderFactory.createTitledBorder("Composizione"));
pnlLista1.setLocation(x, y);
pnlLista1.setSize(w, 70);
pnlLista1.setLocation(x, y);
//pnlLista1.setSize(w, 70);
pnlLista1.setSize(w, pnlProdotti.getHeight() / 6);
scpLista1.setLocation(0, 0);
scpLista1.setSize(w, h);
scpLista1.setBackground(Color.BLUE);
@ -1625,11 +1663,14 @@ public class PuntoCassa extends JFrame implements ActionListener {
// -----------------------------------------------------------------------
x = 0;
y = pnlCategorie.getHeight();
w = pnlCategorie.getWidth() + pnlProdotti.getWidth() - 120;
//w = pnlCategorie.getWidth() + pnlProdotti.getWidth() - 120;
w = displayWidth / 10 * 6;
//h = pnlConto.getHeight();
h = th - pnlProdotti.getHeight();
pnlCliente.setLocation(x, y);
pnlCliente.setSize(w, h);
subPnlCliente.setSize(pnlCliente.getSize().width / 2, pnlCliente.getSize().height);
subPnlTessera.setSize(pnlCliente.getSize().width / 2, pnlCliente.getSize().height);
// -----------------------------------------------------------------------
// ** Panel Conto
@ -1640,7 +1681,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
h = 220;//th-y;
pnlConto.setLocation(x, y);
pnlConto.setSize(w, h - 10);
//pnlConto.setSize(w, h - 10);
pnlConto.setSize(w, pnlProdotti.getHeight() / 6 * 3);
ImageIcon icon = new ImageIcon(imgPath + "freccia_down.jpg");
Image img = icon.getImage();
Image newimg = img.getScaledInstance(50, 50, java.awt.Image.SCALE_SMOOTH);
@ -1669,10 +1711,14 @@ public class PuntoCassa extends JFrame implements ActionListener {
// ** Panel Azioni
// -----------------------------------------------------------------------
//x = 0;
x = pnlLista.getX() - 120;
y = pnlConto.getY() + pnlConto.getHeight();//pnlProdotti.getHeight() + pnlCliente.getHeight();
w = pnlLista.getWidth() + 120; //pnlCategorie.getWidth() + pnlProdotti.getWidth();
h = th - (pnlLista.getHeight() + pnlLista1.getHeight() + pnlConto.getHeight()); //th-y;
//x = pnlLista.getX() - 120;
x = pnlCliente.getWidth();
//y = pnlConto.getY() + pnlConto.getHeight();//pnlProdotti.getHeight() + pnlCliente.getHeight();
y = pnlCliente.getY();
//w = pnlLista.getWidth() + 120; //pnlCategorie.getWidth() + pnlProdotti.getWidth();
w = displayWidth / 10 * 4;
//h = th - (pnlLista.getHeight() + pnlLista1.getHeight() + pnlConto.getHeight()); //th-y;
h = th - pnlProdotti.getHeight();
pnlAzioni.setLocation(x, y);
pnlAzioni.setSize(w, h);
@ -1865,7 +1911,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
Double totAcquisto = 0.0;
try {
if (lblSaldo.getText().length() > 0) {
String saldo = lblSaldo.getText().replace("? ", "").trim().replace(".", "");
String saldo = lblSaldo.getText().replace(" ", "").trim().replace(".", "");
saldo = saldo.replace("[", "");
saldo = saldo.replace("]", "");
saldo = saldo.replace(",", ".");
@ -1875,7 +1921,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}
if (txtTotaleCassa.getText().length() > 0) {
String totaleCassa = txtTotaleCassa.getText().replace("? ", "").replace(".", "");
String totaleCassa = txtTotaleCassa.getText().replace(" ", "").replace(".", "");
totaleCassa = totaleCassa.replace(",", ".");
totAcquisto = Double.valueOf(totaleCassa);
}
@ -1898,7 +1944,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}
DecimalFormat df2 = new DecimalFormat("#,###,###,##0.00");
txtTotaleCassa.setText("? " + df2.format(t));
txtTotaleCassa.setText(" " + df2.format(t));
int p = model.sommaInt(2);
txtTotalePunti.setText("Punti " + p);
@ -1907,7 +1953,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
if (cercaTestoModoPagamento().equalsIgnoreCase("A scalare")) {
Double saldoCarta = 0.0;
if (lblSaldo.getText().trim().length() > 0) {
String saldo = lblSaldo.getText().replace("? ", "").trim().replace(".", "");
String saldo = lblSaldo.getText().replace(" ", "").trim().replace(".", "");
saldo = saldo.replace("[", "");
saldo = saldo.replace("]", "");
saldo = saldo.replace(",", ".");
@ -1916,7 +1962,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}
}
saldoCarta = saldoCarta - t;
lblResiduo.setText("? " + df2.format(saldoCarta));
lblResiduo.setText(" " + df2.format(saldoCarta));
}
}
@ -2100,7 +2146,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
b.addActionListener(this);
b.setVisible(true);
if (tipo.equalsIgnoreCase("CATEGORIE")) {
Font f = new Font("Tahoma", Font.BOLD, 14);
//Font f = new Font("Tahoma", Font.BOLD, 14);
Font f = new Font("Tahoma", Font.BOLD, hFont);
b.setFont(f);
b.setForeground(Color.RED);
@ -2111,7 +2158,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
if (tipo.equalsIgnoreCase("CATEGORIE")) {
JToggleButton bGost = new JToggleButton("[DEFAULT]");
bGost.setName("btnDefault");
Font f = new Font("Tahoma", Font.BOLD, 14);
//Font f = new Font("Tahoma", Font.BOLD, 14);
Font f = new Font("Tahoma", Font.BOLD, hFont);
bGost.setFont(f);
bGost.setForeground(Color.RED);
bGost.setActionCommand("CATEGORIA[0]");
@ -2191,7 +2239,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
Connection dbConnection = DriverManager.getConnection(dbStringa, dbUsername, dbPassword);
st = dbConnection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
rs = st.executeQuery(sql + where + " order by p.id) where ROWNUM <= 7");
Font f = new Font("Tahoma", Font.BOLD, 13);
//Font f = new Font("Tahoma", Font.BOLD, 13);
Font f = new Font("Tahoma", Font.BOLD, hFont);
String jolly = "";
String idJolly = "";
while (rs.next()) {
@ -3339,7 +3388,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}
DecimalFormat df2 = new DecimalFormat("#,###,###,##0.00");
lblSaldo.setText("? " + df2.format(saldo));
lblSaldo.setText(" " + df2.format(saldo));
//24-01-2020--------------------------
MyTableModel model = (MyTableModel) tblLista.getModel();
@ -3349,17 +3398,18 @@ public class PuntoCassa extends JFrame implements ActionListener {
t = t + model2.somma(1);
}
//---------------------------
lblResiduo.setText("? " + df2.format(saldo - t));
lblResiduo.setText(" " + df2.format(saldo - t));
lblPunti.setText(punti);
String tipo = cercaTestoModoPagamento();
lblTipoPagamento.setText(tipo);
//21/12/2016 if (gratuitaResidue <= 0) {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
if (gratuitaResidue <= 0 && (flagBonus == 0 || bonusResidui <= 0)) {
//11/06/24 rimozione controllo su gratuita e bonus
//if (gratuitaResidue <= 0 && (flagBonus == 0 || bonusResidui <= 0)) {
if ((saldo - calcolaTotale()) <= saldoStop) {
//31-10-2019 se lista precaricata e saldo <0 devo chudere
if (stoCalcolando == false) {
//if (stoCalcolando == false) {
if (cercaTestoModoPagamento().equalsIgnoreCase("A scalare")) {
if ((saldo - calcolaTotale()) < 0) {
JOptionPane.showMessageDialog(this, "Saldo insufficiente!", "Saldo", JOptionPane.OK_OPTION);
@ -3368,7 +3418,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
return true;
}
}
}
//}
OK = true;
} else if (saldo <= saldoAlert) {
JOptionPane.showMessageDialog(this,
@ -3379,7 +3429,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
} else {
OK = true;
}
}
//}
return OK;
}
@ -3485,7 +3535,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
String[] saldoMinimo = Utils.mySelect(querySaldo, "saldi",this).split("\\|");
Double saldo = 0.0;
String residuo = lblResiduo.getText().trim().replace("?", "");
String residuo = lblResiduo.getText().trim().replace("", "");
if (residuo.equalsIgnoreCase("[...]")) {
residuo = "0";
}
@ -3522,7 +3572,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
+ " and u.id_categoria = c.id and cf.id_categoria_utenti = c.id";
Double saldo = Double.valueOf(Utils.mySelect(querySaldo, "saldo", this));
Double costoPasto = Double.valueOf(txtTotaleCassa.getText().replace("?", "").trim().replace(",", "."));
Double costoPasto = Double.valueOf(txtTotaleCassa.getText().replace("", "").trim().replace(",", "."));
if (saldo > costoPasto) {
Object[] options = {"A Scalare", "Contanti"};
Object selectedValue = JOptionPane.showOptionDialog(this,
@ -3707,7 +3757,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}
String residuo = lblResiduo.getText().replace("?", "").trim();
String residuo = lblResiduo.getText().replace("", "").trim();
if (residuo.equalsIgnoreCase("[...]")) {
residuo = "0";
}
@ -3841,7 +3891,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
idProfiloTariffario = 0L;
setModoPagamento(modoPagamentoDefault);
isCassaAperta = false;
txtTotaleCassa.setText("? 0,00");
txtTotaleCassa.setText(" 0,00");
txtTotalePunti.setText("Punti 0");
pnlCategorie.setVisible(false);
@ -4276,7 +4326,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
private Double calcolaTotale() {
Double totAcquisto = 0.00;
if (txtTotaleCassa.getText().length() > 0) {
String saldo = txtTotaleCassa.getText().replace("? ", "").replace(".", "");
String saldo = txtTotaleCassa.getText().replace(" ", "").replace(".", "");
saldo = saldo.replace(",", ".");
totAcquisto = Double.valueOf(saldo);
}
@ -4494,7 +4544,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
private String formatLocalDateTime(LocalDateTime data){
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm:ss");
return data.format(formatter);
return "to_date('" + data.format(formatter) + "','dd/mm/yyyy HH24:MI:SS')";
}
private String formattaData(Date data) {
@ -4557,11 +4607,13 @@ public class PuntoCassa extends JFrame implements ActionListener {
// *** occupare tutto lo schermo utile
// =================================================================
Toolkit toolkit = Toolkit.getDefaultToolkit();
Dimension screenSize = toolkit.getScreenSize();
Dimension screenSize = toolkit.getScreenSize();
p.setSize(1024, 768);
p.setLocation((int) (screenSize.width - 1024) / 2, (int) (screenSize.height - 768) / 2);
//p.setSize(1024, 768);
//p.setLocation((int) (screenSize.width - 1024) / 2, (int) (screenSize.height - 768) / 2);
p.resize();
//p.setSize((int)screenSize.width / 3 * 2, (int)screenSize.height / 3 * 2);
p.setLocation((int) (screenSize.width - p.getSize().width) / 2, (int) (screenSize.height - p.altezzaBarraApplicazioni - p.getSize().height) / 2);
// =================================================================
// *** Mostra la form nello stato iniziale
@ -4853,8 +4905,6 @@ public class PuntoCassa extends JFrame implements ActionListener {
private javax.swing.JButton jBtnStorno;
private javax.swing.JButton jBtnprodotti;
private javax.swing.JCheckBox jChLogin;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JToggleButton jTBP0;
private javax.swing.JToggleButton jTBP1;
private javax.swing.JToggleButton jTBP2;
@ -4915,6 +4965,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
protected javax.swing.JPanel pnlTop;
private javax.swing.JScrollPane scpLista;
private javax.swing.JScrollPane scpLista1;
private javax.swing.JPanel subPnlCliente;
private javax.swing.JPanel subPnlTessera;
private javax.swing.JTable tblLista;
private javax.swing.JTable tblLista1;
private javax.swing.JPasswordField txtPassword;