Skip to content

Commit

Permalink
#187 default values for standard fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@teosarca
teosarca committed Feb 25, 2017
1 parent 488da5a commit 52a338c
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 18 deletions.
20 changes: 13 additions & 7 deletions metasfresh-webui-api/src/main/java/de/metas/ui/web/window/WindowConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
*
* 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
* 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, see
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
Expand Down Expand Up @@ -61,11 +61,17 @@ public final class WindowConstants
public static final String FIELDNAME_OrderType = "OrderType";
public static final String FIELDNAME_M_AttributeSetInstance_ID = "M_AttributeSetInstance_ID";
public static final String FIELDNAME_Line = "Line";
public static final Set<String> FIELDNAMES_CreatedUpdated = ImmutableSet.of("Created", "CreatedBy", "Updated", "UpdatedBy");


public static final String FIELDNAME_AD_Client_ID = "AD_Client_ID";
public static final String FIELDNAME_AD_Org_ID = "AD_Org_ID";
public static final String FIELDNAME_Created = "Created";
public static final String FIELDNAME_CreatedBy = "CreatedBy";
public static final String FIELDNAME_Updated = "Updated";
public static final String FIELDNAME_UpdatedBy = "UpdatedBy";
public static final Set<String> FIELDNAMES_CreatedUpdated = ImmutableSet.of(FIELDNAME_Created, FIELDNAME_CreatedBy, FIELDNAME_Updated, FIELDNAME_UpdatedBy);

public static final String FIELDNAME_DocumentSummary = "V$DocumentSummary";


public static final String CONTEXTVAR_NextLineNo = "CtxVar_NextLineNo";

private WindowConstants()
Expand All @@ -82,8 +88,8 @@ public static boolean isProtocolDebugging()
public static void setProtocolDebugging(final boolean protocolDebugging)
{
final boolean protocolDebuggingPrev = WindowConstants.protocolDebugging.getAndSet(protocolDebugging);
if(protocolDebuggingPrev == protocolDebugging)

if (protocolDebuggingPrev == protocolDebugging)
{
return;
}
Expand Down
49 changes: 38 additions & 11 deletions ...va/de/metas/ui/web/window/descriptor/factory/standard/DefaultValueExpressionsFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 2 of the
* License, or (at your option) any later version.
*
*
* 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
* 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, see
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
Expand All @@ -58,6 +58,10 @@ public class DefaultValueExpressionsFactory
private static final Optional<IExpression<?>> DEFAULT_VALUE_EXPRESSION_Zero_Integer;
private static final Optional<IExpression<?>> DEFAULT_VALUE_EXPRESSION_M_AttributeSetInstance_ID;
private static final Optional<IExpression<?>> DEFAULT_VALUE_EXPRESSION_NextLineNo;
private static final Optional<IExpression<?>> DEFAULT_VALUE_AD_Client_ID;
private static final Optional<IExpression<?>> DEFAULT_VALUE_AD_Org_ID;
private static final Optional<IExpression<?>> DEFAULT_VALUE_ContextDate;
private static final Optional<IExpression<?>> DEFAULT_VALUE_ContextUser_ID;

static
{
Expand All @@ -69,18 +73,23 @@ public class DefaultValueExpressionsFactory
DEFAULT_VALUE_EXPRESSION_Zero_Integer = Optional.of(expressionFactory.compile("0", IntegerStringExpression.class));
DEFAULT_VALUE_EXPRESSION_M_AttributeSetInstance_ID = Optional.of(expressionFactory.compile(String.valueOf(IAttributeDAO.M_AttributeSetInstance_ID_None), IntegerStringExpression.class));
DEFAULT_VALUE_EXPRESSION_NextLineNo = Optional.of(expressionFactory.compile("@" + WindowConstants.CONTEXTVAR_NextLineNo + "@", IntegerStringExpression.class));

DEFAULT_VALUE_AD_Client_ID = Optional.of(expressionFactory.compile("@" + WindowConstants.FIELDNAME_AD_Client_ID + "@", IntegerStringExpression.class));
DEFAULT_VALUE_AD_Org_ID = Optional.of(expressionFactory.compile("@" + WindowConstants.FIELDNAME_AD_Org_ID + "@", IntegerStringExpression.class));
DEFAULT_VALUE_ContextUser_ID = Optional.of(expressionFactory.compile("@#AD_User_ID@", IntegerStringExpression.class));
DEFAULT_VALUE_ContextDate = Optional.of(expressionFactory.compile("@#Date@", DateStringExpression.class));
}

//
// Parameters
private final boolean _isDetailTab;

public DefaultValueExpressionsFactory(final boolean isDetailTab)
{
super();
this._isDetailTab = isDetailTab;
_isDetailTab = isDetailTab;
}

private boolean isDetailTab()
{
return _isDetailTab;
Expand All @@ -92,10 +101,10 @@ public Optional<IExpression<?>> extractDefaultValueExpression(
, final DocumentFieldWidgetType widgetType //
, final Class<?> fieldValueClass //
, final boolean isMandatory //
)
)
{
final boolean isDetailTab = isDetailTab();

//
// Case: "Line" field in included tabs
if (WindowConstants.FIELDNAME_Line.equals(columnName)
Expand All @@ -109,7 +118,25 @@ public Optional<IExpression<?>> extractDefaultValueExpression(
// If there is no default value expression, use some defaults
if (defaultValueStr == null || defaultValueStr.isEmpty())
{
if (Boolean.class.equals(fieldValueClass))
if (WindowConstants.FIELDNAME_AD_Client_ID.equals(columnName))
{
return DEFAULT_VALUE_AD_Client_ID;
}
else if (WindowConstants.FIELDNAME_AD_Org_ID.equals(columnName))
{
return DEFAULT_VALUE_AD_Org_ID;
}
else if (WindowConstants.FIELDNAME_Created.equals(columnName)
|| WindowConstants.FIELDNAME_Updated.equals(columnName))
{
return DEFAULT_VALUE_ContextDate;
}
else if (WindowConstants.FIELDNAME_CreatedBy.equals(columnName)
|| WindowConstants.FIELDNAME_UpdatedBy.equals(columnName))
{
return DEFAULT_VALUE_ContextUser_ID;
}
else if (Boolean.class.equals(fieldValueClass))
{
if (WindowConstants.FIELDNAME_IsActive.equals(columnName))
{
Expand Down Expand Up @@ -221,7 +248,7 @@ else if (Boolean.class.equals(fieldValueClass))
* <li>we have some cases where a List default value is something like 'P'
* <li>we have some cases where a Table's reference default value is something like 'de.metas.swat'
* </ul>
*
*
* @param expressionStr
* @return fixed expression or same expression if does not apply
*/
Expand Down

0 comments on commit 52a338c

Please sign in to comment.