Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Krishna Vemulavada
/
vera_2.1_app
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b4bf90c9
authored
Sep 22, 2016
by
Kunj Gupta
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
UOFLMA-94: Fix - In Variables form, do not display active=false items.
parent
48819ab5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
app/src/main/java/com/vsoft/uoflservicenow/db/models/CatalogueVariable.java
app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java
app/src/main/java/com/vsoft/uoflservicenow/db/models/CatalogueVariable.java
View file @
b4bf90c9
...
...
@@ -42,6 +42,10 @@ public class CatalogueVariable {
@SerializedName
(
"reference_display_column"
)
@Expose
private
String
referenceColumnName
;
@SerializedName
(
"Active"
)
@Expose
private
boolean
active
;
// @SerializedName("type")
// @Expose
...
...
@@ -161,6 +165,14 @@ public class CatalogueVariable {
this
.
referenceColumnName
=
referenceColumnName
;
}
public
boolean
isActive
()
{
return
active
;
}
public
void
setActive
(
boolean
active
)
{
this
.
active
=
active
;
}
public
List
<
VariableChoice
>
getVariableChoiceList
()
{
return
mVariableChoiceList
;
}
...
...
@@ -228,6 +240,8 @@ public class CatalogueVariable {
", isNoneRequired="
+
isNoneRequired
+
", referenceTable='"
+
referenceTable
+
'\''
+
", order="
+
order
+
", referenceColumnName='"
+
referenceColumnName
+
'\''
+
", active="
+
active
+
", type="
+
type
+
", mVariableChoiceList="
+
mVariableChoiceList
+
'}'
;
...
...
app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java
View file @
b4bf90c9
...
...
@@ -228,6 +228,8 @@ public class CatalogueVariableScreen extends AppCompatActivity {
if
(!
mCatalogueVariableList
.
isEmpty
())
{
for
(
int
i
=
0
;
i
<
mCatalogueVariableList
.
size
();
i
++)
{
CatalogueVariable
catalogueVariable
=
mCatalogueVariableList
.
get
(
i
);
/*If API return active false for a variable, there is no need show that variable*/
if
(
catalogueVariable
.
isActive
())
{
ViewType
viewType
=
catalogueVariable
.
getType
();
CatalogueLog
.
e
(
"viewType: "
+
viewType
+
", Question: "
+
catalogueVariable
.
getQuestionText
()
+
", Order: "
+
catalogueVariable
.
getOrder
());
if
(
catalogueVariable
.
getName
()
==
null
)
{
...
...
@@ -303,6 +305,7 @@ public class CatalogueVariableScreen extends AppCompatActivity {
}
}
}
}
private
View
getErrorView
()
{
TextView
textView
=
new
TextView
(
CatalogueVariableScreen
.
this
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment