QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'QQQ-41-v-2-of-app-home-pages-dashboards-etc' into feature/sprint-11

Browse Source
This commit is contained in:
Tim Chamberlain
2022-09-20 15:20:05 -05:00
parent d5a319c458 d8c6bba6b4
commit f83d2b3fc8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/TableData.java
View File

@ -55,14 +55,14 @@ public class TableData implements QWidget
private String title;
private List<Column> columns;
private List<Map<String, Object>> rows;
private List<String> dropdownOptions;
private List<Map<String, String>> dropdownOptions;
/*******************************************************************************
**
*******************************************************************************/
public TableData(String title, List<Column> columns, List<Map<String, Object>> rows, List<String> dropdownOptions)
public TableData(String title, List<Column> columns, List<Map<String, Object>> rows, List<Map<String, String>> dropdownOptions)
{
setTitle(title);
setColumns(columns);
@ -189,7 +189,7 @@ public class TableData implements QWidget
** Getter for dropdownOptions
**
*******************************************************************************/
public List<String> getDropdownOptions()
public List<Map<String, String>> getDropdownOptions()
{
return dropdownOptions;
}
@ -200,7 +200,7 @@ public class TableData implements QWidget
** Setter for dropdownOptions
**
*******************************************************************************/
public void setDropdownOptions(List<String> dropdownOptions)
public void setDropdownOptions(List<Map<String, String>> dropdownOptions)
{
this.dropdownOptions = dropdownOptions;
}
@ -211,7 +211,7 @@ public class TableData implements QWidget
** Fluent setter for dropdownOptions
**
*******************************************************************************/
public TableData withDropdownOptions(List<String> dropdownOptions)
public TableData withDropdownOptions(List<Map<String, String>> dropdownOptions)
{
this.dropdownOptions = dropdownOptions;
return (this);

5
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java
View File

@ -24,6 +24,7 @@ package com.kingsrook.qqq.backend.core.utils;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -115,6 +116,10 @@ public class ValueUtils
{
return (i);
}
else if(value instanceof BigInteger b)
{
return (b.intValue());
}
else if(value instanceof Long l)
{
return Math.toIntExact(l);