Skip to content

Commit

Permalink
adempiere#114 Add "CreateFrom in
Browse files Browse the repository at this point in the history 
C_BankStatement" like Dynamic Form
* Change to Modal view form inside window
  • Loading branch information
@yamelsenih
yamelsenih committed Nov 27, 2015
1 parent 839ae38 commit 0ee907a
Show file tree
Hide file tree
Showing 14 changed files with 886 additions and 237 deletions.
2 changes: 2 additions & 0 deletions client/src/org/compiere/apps/APanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2653,6 +2653,8 @@ else if (col.equals("Posted") && MRole.getDefault().isShowAcct())
ff.openForm(form_ID);
ff.pack();
AEnv.showCenterScreen(ff);
// Refresh
m_curTab.dataRefresh();
// End Yamel Senih
return;
}
Expand Down
111 changes: 65 additions & 46 deletions ...rg/compiere/grid/CreateFromStatement.java → ...mpiere/apps/form/CreateFromStatement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.compiere.grid;
package org.compiere.apps.form;

import java.math.BigDecimal;
import java.sql.PreparedStatement;
Expand All @@ -21,12 +21,14 @@
import java.util.Vector;
import java.util.logging.Level;

import org.adempiere.exceptions.AdempiereException;
import org.compiere.minigrid.IMiniTable;
import org.compiere.model.GridTab;
import org.compiere.model.I_C_BankStatement;
import org.compiere.model.MBankAccount;
import org.compiere.model.MBankStatement;
import org.compiere.model.MBankStatementLine;
import org.compiere.model.MPayment;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
Expand All @@ -43,33 +45,54 @@
* <li>BF [ 2007837 ] VCreateFrom.save() should run in trx
* @author Michael McKay (mjmckay)
* <li>BF3439685 Create from for Statement Line picks wrong date
* See https://sourceforge.net/tracker/?func=detail&aid=3439695&group_id=176962&atid=879332
* See https://sourceforge.net/tracker/?func=detail&aid=3439695&group_id=176962&atid=879332
* @author Yamel Senih, ysenih@erpcya.com, ERPCyA http://www.erpcya.com
* <li> FR [ 114 ] Change "Create From" UI for Form like Dialog in window without "hardcode"
* @see https://github.com/adempiere/adempiere/issues/114
*/
public class CreateFromStatement extends CreateFrom
{
public MBankAccount bankAccount;
public class CreateFromStatement {
/** Logger */
protected CLogger log = CLogger.getCLogger(getClass());
/** Model Statement */
private MBankStatement m_BankStatement;
/** Bank Account */
private MBankAccount m_BankAccount;
/** Record Identifier */
private int m_Record_ID = 0;

/**
* Protected Constructor
* @param mTab MTab
* Valid Table and Record Identifier
* @param p_AD_Table_ID
* @param p_Record_ID
*/
public CreateFromStatement(GridTab mTab)
{
super(mTab);
log.info(mTab.toString());
} // VCreateFromInvoice

protected void validTable(int p_AD_Table_ID, int p_Record_ID) {
// Valid Table
if(p_AD_Table_ID != I_C_BankStatement.Table_ID) {
throw new AdempiereException("@AD_Table_ID@ @C_BankStatement_ID@ @NotFound@");
}
// Valid Record Identifier
if(p_Record_ID <= 0) {
throw new AdempiereException("@SaveErrorRowNotFound@");
}
// Default
m_Record_ID = p_Record_ID;
// Instance Bank Statement
m_BankStatement = new MBankStatement(Env.getCtx(), m_Record_ID, null);
m_BankAccount = m_BankStatement.getBankAccount();
}

/**
* Dynamic Init
* @return true if initialized
* Get Account
* @return
*/
public boolean dynInit() throws Exception
{
log.config("");
setTitle(Msg.translate(Env.getCtx(), "C_BankStatement_ID") + " .. " + Msg.translate(Env.getCtx(), "CreateFrom"));

return true;
} // dynInit
protected int getC_BankAccount_ID() {
// Valid null
if(m_BankStatement != null) {
return m_BankStatement.getC_BankAccount_ID();
}
// Default
return 0;
}

/**************************************************************************
* Construct SQL Where Clause and define parameters
Expand Down Expand Up @@ -136,14 +159,13 @@ else if (from != null && to != null)
* @param forCount for counting records
* @throws SQLException
*/
void setParameters(PreparedStatement pstmt, boolean forCount,
private void setParameters(PreparedStatement pstmt, boolean forCount,
String DocumentNo, Object BPartner, Object DateFrom, Object DateTo,
Object AmtFrom, Object AmtTo, Object DocType, Object TenderType, String AuthCode)
throws SQLException
{
throws SQLException {
int index = 1;

pstmt.setInt(index++, bankAccount.getC_BankAccount_ID());
pstmt.setInt(index++, m_BankStatement.getC_BankAccount_ID());

if (DocumentNo.length() > 0)
pstmt.setString(index++, getSQLText(DocumentNo));
Expand Down Expand Up @@ -260,13 +282,11 @@ protected Vector<Vector<Object>> getBankData(String DocumentNo, Object BPartner,
return data;
}

public void info()
{

}

protected void configureMiniTable (IMiniTable miniTable)
{
/**
* Configure Mini Table Column
* @param miniTable
*/
protected void configureMiniTable (IMiniTable miniTable) {
miniTable.setColumnClass(0, Boolean.class, false); // 0-Selection
miniTable.setColumnClass(1, Timestamp.class, true); // 1-TrxDate
miniTable.setColumnClass(2, String.class, true); // 2-Payment
Expand All @@ -282,18 +302,14 @@ protected void configureMiniTable (IMiniTable miniTable)
* Save Statement - Insert Data
* @return true if saved
*/
public boolean save(IMiniTable miniTable, String trxName)
{
public boolean save(IMiniTable miniTable, String trxName) {
// fixed values
int C_BankStatement_ID = ((Integer)getGridTab().getValue("C_BankStatement_ID")).intValue();
MBankStatement bs = new MBankStatement (Env.getCtx(), C_BankStatement_ID, trxName);
MBankStatement bs = new MBankStatement (Env.getCtx(), m_Record_ID, trxName);
log.config(bs.toString());

// Lines
for (int i = 0; i < miniTable.getRowCount(); i++)
{
if (((Boolean)miniTable.getValueAt(i, 0)).booleanValue())
{
for (int i = 0; i < miniTable.getRowCount(); i++) {
if (((Boolean)miniTable.getValueAt(i, 0)).booleanValue()) {
Timestamp trxDate = (Timestamp)miniTable.getValueAt(i, 1); // 1-DateTrx
KeyNamePair pp = (KeyNamePair)miniTable.getValueAt(i, 2); // 2-C_Payment_ID
int C_Payment_ID = pp.getKey();
Expand All @@ -315,7 +331,7 @@ public boolean save(IMiniTable miniTable, String trxName)

bsl.setTrxAmt(TrxAmt);
bsl.setStmtAmt(TrxAmt);
bsl.setC_Currency_ID(bankAccount.getC_Currency_ID());
bsl.setC_Currency_ID(m_BankAccount.getC_Currency_ID());

if (!bsl.save())
log.log(Level.SEVERE, "Line not created #" + i);
Expand All @@ -324,8 +340,11 @@ public boolean save(IMiniTable miniTable, String trxName)
return true;
} // save

protected Vector<String> getOISColumnNames()
{
/**
* Get Column Names from Table
* @return
*/
protected Vector<String> getOISColumnNames() {
// Header Info
Vector<String> columnNames = new Vector<String>(6);
columnNames.add(Msg.getMsg(Env.getCtx(), "Select"));
Expand All @@ -338,4 +357,4 @@ protected Vector<String> getOISColumnNames()

return columnNames;
}
}
}
52 changes: 52 additions & 0 deletions client/src/org/compiere/apps/form/ICreateFrom.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* Copyright (C) 2003-2015 E.R.P. Consultores y Asociados, C.A. *
* All Rights Reserved. *
* Contributor(s): Yamel Senih www.erpcya.com *
*****************************************************************************/
package org.compiere.apps.form;

import org.compiere.minigrid.IMiniTable;

/**
* @author Yamel Senih, ysenih@erpcya.com, ERPCyA http://www.erpcya.com
* <li> FR [ 114 ] Change "Create From" UI for Form like Dialog in window without "hardcode"
* <li> It is result from change CreateFrom to dynamic form
* @see https://github.com/adempiere/adempiere/issues/114
*/
public interface ICreateFrom {

/**
* Get Window No from Form
* @return
*/
public int getWindowNo();

/**
* Prepare Information
*/
public void info();

/**
* Save Data from table
* @param miniTable
* @param trxName
* @return
*/
public boolean save(IMiniTable miniTable, String trxName);

/**
* Close Window
*/
public void dispose();
}

0 comments on commit 0ee907a

Please sign in to comment.