No commit message

cwaweru · Feb 9, 2019 · 1ca1015 · 1ca1015
1 parent 79634c4
commit 1ca1015
Show file tree

Hide file tree

Showing 145 changed files with 7,441 additions and 3,833 deletions.
diff --git a/Icons/excel.png b/Icons/excel.png
diff --git a/biz/systempartners/claims/PharmacyClaim.java b/biz/systempartners/claims/PharmacyClaim.java
@@ -301,7 +301,7 @@ public void createXMLDoc(javax.swing.JTable invoicesTable, java.sql.Connection c
                         try {
                             connectDB.setAutoCommit(false);
 
-                            java.sql.PreparedStatement pstmt11 = connectDB.prepareStatement("UPDATE ac_cash_collection SET closed = true WHERE patient_no = '"+com.afrisoftech.hospinventory.PatientsBillingIntfr.patientNoTxt.getText()+"' AND closed = false AND date::date BETWEEN (current_date -1) AND current_date and description ilike 'copay%'");
+                            java.sql.PreparedStatement pstmt11 = connectDB.prepareStatement("UPDATE ac_cash_collection SET closed = true WHERE patient_no = '"+com.afrisoftech.hospinventory.PatientsBillingIntfr.patientNumberTxt.getText()+"' AND closed = false AND date::date BETWEEN (current_date -1) AND current_date and description ilike 'copay%'");
                             pstmt11.executeUpdate();
 
                             connectDB.commit();
@@ -498,7 +498,7 @@ public void workonXmlDocument(org.w3c.dom.Document xmlDoc, javax.swing.JTable in
                     connectDB.setAutoCommit(false);
 
                     java.sql.Statement ps1 = connectDB.createStatement();
-                    java.sql.ResultSet rst1 = ps1.executeQuery("select description,debit*-1 FROM ac_cash_collection WHERE patient_no = '"+com.afrisoftech.hospinventory.PatientsBillingIntfr.patientNoTxt.getText()+"' AND closed = false AND date::date BETWEEN (current_date -1) AND current_date and description ilike 'copay%'");
+                    java.sql.ResultSet rst1 = ps1.executeQuery("select description,debit*-1 FROM ac_cash_collection WHERE patient_no = '"+com.afrisoftech.hospinventory.PatientsBillingIntfr.patientNumberTxt.getText()+"' AND closed = false AND date::date BETWEEN (current_date -1) AND current_date and description ilike 'copay%'");
                     while (rst1.next()){
                         System.out.println("I have started creating copy nodes");
                         txElement = xmlDoc.createElement("Transaction");

diff --git a/com/afrisoftech/accounting/DebtorsBillingIntfr.java b/com/afrisoftech/accounting/DebtorsBillingIntfr.java
@@ -1133,7 +1133,7 @@ private void jTextField113CaretUpdate(javax.swing.event.CaretEvent evt) {//GEN-F
             if (jTextField113.getCaretPosition() > 3) {
 //                System.out.println("Nothing");
 //            } else {
-                jSearchTable2.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectorsCaret(connectDB, "select trim(scheme_name) as scheme ,account_no,payer_name from ac_schemes where account_no ILIKE '%" + jTextField113.getText().toString() + "%' AND closed = false "));
+                jSearchTable2.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectors(connectDB, "select trim(scheme_name) as scheme ,account_no,payer_name from ac_schemes where account_no ILIKE '%" + jTextField113.getText().toString() + "%' AND closed = false "));
 
                 jSearchTable2.setShowHorizontalLines(false);
                 jSearchScrollPane2.setViewportView(jSearchTable2);
@@ -1145,7 +1145,7 @@ private void jTextField113CaretUpdate(javax.swing.event.CaretEvent evt) {//GEN-F
 //                    System.out.println("Nothing");
 //                } else {
 
-                    jSearchTable2.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectorsCaret(connectDB, "select trim(scheme_name) as scheme ,account_no,payer_name from ac_schemes where scheme_name ILIKE '%" + jTextField113.getText().toString() + "%' AND closed = false "));
+                    jSearchTable2.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectors(connectDB, "select trim(scheme_name) as scheme ,account_no,payer_name from ac_schemes where scheme_name ILIKE '%" + jTextField113.getText().toString() + "%' AND closed = false "));
 
                     jSearchTable2.setShowHorizontalLines(false);
                     jSearchScrollPane2.setViewportView(jSearchTable2);

diff --git a/com/afrisoftech/accounting/DocumentTrackIntfr.java b/com/afrisoftech/accounting/DocumentTrackIntfr.java
@@ -1074,11 +1074,11 @@ private void lpotxtCaretUpdate(javax.swing.event.CaretEvent evt) {//GEN-FIRST:ev
         // TODO add your handling code here:
         if(lpotxt.getCaretPosition()>1){
             if(jChecklpo.isSelected()==true){
-                 lpotable.setModel(TableModel.createTableVectorsCaret(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  order_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by order_no asc"));
+                 lpotable.setModel(TableModel.createTableVectors(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  order_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by order_no asc"));
             }else if(jCheckInv.isSelected()==true){
-                 lpotable.setModel(TableModel.createTableVectorsCaret(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  invoice_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by invoice_no asc"));
+                 lpotable.setModel(TableModel.createTableVectors(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  invoice_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by invoice_no asc"));
             }else if(jCheckvoucher.isSelected()==true){
-                 lpotable.setModel(TableModel.createTableVectorsCaret(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  voucher_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by voucher_no asc"));
+                 lpotable.setModel(TableModel.createTableVectors(connectDB, "SELECT distinct invoice_no,voucher_no,order_no,sum(credit-debit) from ac_accounts_payable where dealer='"+dealerNameTxt.getText()+"' and  voucher_no ilike '%"+lpotxt.getText()+"%' group by 1,2,3 order by voucher_no asc"));
             }
 
 

diff --git a/com/afrisoftech/accounting/EditDebtorsInvoiceIntfr.java b/com/afrisoftech/accounting/EditDebtorsInvoiceIntfr.java
@@ -362,7 +362,7 @@ private void searchButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void invoiceSearchTxtCaretUpdate(javax.swing.event.CaretEvent evt) {//GEN-FIRST:event_invoiceSearchTxtCaretUpdate
         if(invoiceSearchTxt.getCaretPosition()>3){
-        this.invoiceSearchTable.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectorsCaret(connectDB, "SELECT invoice_no, date, account_no, dealer as debtor, reason as invoice_detail, debit as invoice_amount FROM ac_debtors WHERE invoice_no ilike '%" + invoiceSearchTxt.getText() + "%'"));
+        this.invoiceSearchTable.setModel(com.afrisoftech.dbadmin.TableModel.createTableVectors(connectDB, "SELECT invoice_no, date, account_no, dealer as debtor, reason as invoice_detail, debit as invoice_amount FROM ac_debtors WHERE invoice_no ilike '%" + invoiceSearchTxt.getText() + "%'"));
         }
         // TODO add your handling code here:
     }//GEN-LAST:event_invoiceSearchTxtCaretUpdate

diff --git a/com/afrisoftech/accounting/ExemptionWaiverintfr.form b/com/afrisoftech/accounting/ExemptionWaiverintfr.form
@@ -313,7 +313,7 @@
 
                   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
                   <SubComponents>
-                    <Component class="javax.swing.JTextField" name="registrationNumberTxt">
+                    <Component class="javax.swing.JTextField" name="patientNumberTxt">
                       <Properties>
                         <Property name="editable" type="boolean" value="false"/>
                       </Properties>
@@ -734,6 +734,19 @@
                 </Component>
               </SubComponents>
             </Container>
+            <Component class="javax.swing.JButton" name="jButton2">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="View Detailed Bill"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+                  <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="1.0"/>
+                </Constraint>
+              </Constraints>
+            </Component>
           </SubComponents>
         </Container>
       </SubComponents>