sebse/angulardynformmodule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dropdown foreign bug fixes

Browse Source
This commit is contained in:
Sebastian Seedorf
2017-06-09 16:44:58 +02:00
parent cc49a89ea4
commit 37eb1e37ee
6 changed files with 147 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
.idea/workspace.xml generated
View File

@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="77c12afa-55f1-462c-96eb-1733ba14cab9" name="Default" comment="Dropdown foreign implementation">
<list default="true" id="77c12afa-55f1-462c-96eb-1733ba14cab9" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/app.component.html" afterPath="$PROJECT_DIR$/src/app/app.component.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/app.component.ts" afterPath="$PROJECT_DIR$/src/app/app.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-question.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-question.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textarea-input.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textarea-input.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textbox-input.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textbox-input.component.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@@ -27,8 +25,8 @@
<file leaf-file-name="app.component.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="10" column="25" lean-forward="false" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state relative-caret-position="627">
<caret line="44" column="31" lean-forward="true" selection-start-line="44" selection-start-column="31" selection-end-line="44" selection-end-column="31" />
<folding />
</state>
</provider>
@@ -44,21 +42,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="textbox-input.component.ts" pinned="false" current-in-tab="true">
<file leaf-file-name="textbox-input.component.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textbox-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="58" column="36" lean-forward="true" selection-start-line="58" selection-start-column="36" selection-end-line="58" selection-end-column="36" />
<state relative-caret-position="151">
<caret line="42" column="30" lean-forward="true" selection-start-line="42" selection-start-column="30" selection-end-line="42" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="checkbox-input.component.ts" pinned="false" current-in-tab="false">
<file leaf-file-name="checkbox-input.component.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
<state relative-caret-position="136">
<caret line="10" column="125" lean-forward="false" selection-start-line="10" selection-start-column="125" selection-end-line="10" selection-end-column="125" />
<folding />
</state>
</provider>
@@ -78,7 +76,7 @@
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/custom-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<caret line="36" column="11" lean-forward="false" selection-start-line="36" selection-start-column="2" selection-end-line="36" selection-end-column="11" />
<folding />
</state>
</provider>
@@ -98,9 +96,9 @@
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
<caret line="52" column="5" lean-forward="true" selection-start-line="52" selection-start-column="5" selection-end-line="52" selection-end-column="5" />
<folding>
<marker date="1496824450537" expanded="true" signature="404:466" ph="..." />
<marker date="1497013791649" expanded="true" signature="404:466" ph="..." />
</folding>
</state>
</provider>
@@ -109,37 +107,26 @@
<file leaf-file-name="dropdown-input.component.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-750">
<caret line="43" column="37" lean-forward="false" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
<state relative-caret-position="969">
<caret line="57" column="19" lean-forward="false" selection-start-line="57" selection-start-column="19" selection-end-line="57" selection-end-column="19" />
<folding>
<element signature="e#0#85#0" expanded="true" />
<marker date="1497012606025" expanded="true" signature="513:626" ph="..." />
<marker date="1497018842009" expanded="true" signature="455:568" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="dropdown-input.component.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.js">
<file leaf-file-name="dyn-form.component.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="79" column="38" lean-forward="false" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
<state relative-caret-position="102">
<caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
<folding>
<marker date="1497012610279" expanded="true" signature="1304:4237" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="1768:1778" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3843:4008" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3859:4001" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3875:3999" ph="{&quot;message&quot;: &quot;This value is invalid. Please select another value!&quot;...}" />
<marker date="1497012610279" expanded="true" signature="4098:4199" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="4298:4360" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4428:4490" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4558:4618" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4683:4744" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4863:5777" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4886:5705" ph="{&quot;selector&quot;: 'dropdown-input'...}" />
<marker date="1497012610279" expanded="true" signature="5235:5699" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="5249:5443" ph="{&quot;provide&quot;: forms_1.NG_VALUE_ACCESSOR...}" />
<marker date="1497012610279" expanded="true" signature="5457:5647" ph="{&quot;provide&quot;: forms_1.NG_VALIDATORS...}" />
<marker date="1497013791538" expanded="true" signature="315:875" ph="..." />
<marker date="1497013791538" expanded="true" signature="364:733" ph="..." />
<marker date="1497013791538" expanded="true" signature="593:720" ph="..." />
<marker date="1497013791538" expanded="true" signature="762:863" ph="..." />
</folding>
</state>
</provider>
@@ -168,9 +155,7 @@
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/types/keys.pipe.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/types/question.interface.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.module.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/custom-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts" />
<option value="$PROJECT_DIR$/src/app/services/http-cached.service.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/services/question.service.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/types/form.interface.ts" />
@@ -180,11 +165,13 @@
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-question.component.ts" />
<option value="$PROJECT_DIR$/src/app/app.component.html" />
<option value="$PROJECT_DIR$/src/index.html" />
<option value="$PROJECT_DIR$/src/app/app.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textbox-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textarea-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/app.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts" />
<option value="$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts" />
</list>
</option>
</component>
@@ -582,7 +569,7 @@
<workItem from="1496731076030" duration="19887000" />
<workItem from="1496819656295" duration="18241000" />
<workItem from="1496903500356" duration="17940000" />
<workItem from="1496989834889" duration="12244000" />
<workItem from="1496989834889" duration="17916000" />
</task>
<task id="LOCAL-00001" summary="Merging">
<created>1496129612668</created>
@@ -654,11 +641,18 @@
<option name="project" value="LOCAL" />
<updated>1496928461665</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="Dropdown foreign implementation">
<created>1497012996560</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1497012996560</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="140465000" />
<option name="totallyTimeSpent" value="146137000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -779,7 +773,7 @@
<caret line="51" column="38" lean-forward="false" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding>
<element signature="e#0#85#0" expanded="true" />
<marker date="1497012606025" expanded="true" signature="513:626" ph="..." />
<marker date="1497018842009" expanded="true" signature="455:568" ph="..." />
</folding>
</state>
</provider>
@@ -820,11 +814,10 @@
<state relative-caret-position="408">
<caret line="24" column="46" lean-forward="true" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
<folding>
<element signature="e#0#95#0" expanded="false" />
<marker date="1496827697309" expanded="true" signature="315:875" ph="..." />
<marker date="1496827697309" expanded="true" signature="364:733" ph="..." />
<marker date="1496827697309" expanded="true" signature="593:720" ph="..." />
<marker date="1496827697309" expanded="true" signature="762:863" ph="..." />
<marker date="1497013791538" expanded="true" signature="315:875" ph="..." />
<marker date="1497013791538" expanded="true" signature="364:733" ph="..." />
<marker date="1497013791538" expanded="true" signature="593:720" ph="..." />
<marker date="1497013791538" expanded="true" signature="762:863" ph="..." />
</folding>
</state>
</provider>
@@ -876,7 +869,7 @@
<caret line="51" column="38" lean-forward="false" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
<folding>
<element signature="e#0#85#0" expanded="true" />
<marker date="1497012606025" expanded="true" signature="513:626" ph="..." />
<marker date="1497018842009" expanded="true" signature="455:568" ph="..." />
</folding>
</state>
</provider>
@@ -984,20 +977,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="53" column="7" lean-forward="false" selection-start-line="53" selection-start-column="7" selection-end-line="53" selection-end-column="7" />
<folding>
<element signature="e#0#95#0" expanded="false" />
<marker date="1496827697309" expanded="true" signature="315:875" ph="..." />
<marker date="1496827697309" expanded="true" signature="364:733" ph="..." />
<marker date="1496827697309" expanded="true" signature="593:720" ph="..." />
<marker date="1496827697309" expanded="true" signature="762:863" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/types/form.interface.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
@@ -1126,57 +1105,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="10" column="25" lean-forward="false" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="79" column="38" lean-forward="false" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
<state relative-caret-position="202">
<caret line="80" column="38" lean-forward="false" selection-start-line="80" selection-start-column="38" selection-end-line="80" selection-end-column="38" />
<folding>
<marker date="1497012610279" expanded="true" signature="1304:4237" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="1768:1778" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3843:4008" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3859:4001" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="3875:3999" ph="{&quot;message&quot;: &quot;This value is invalid. Please select another value!&quot;...}" />
<marker date="1497012610279" expanded="true" signature="4098:4199" ph="{...}" />
<marker date="1497012610279" expanded="true" signature="4298:4360" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4428:4490" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4558:4618" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4683:4744" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4863:5777" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="4886:5705" ph="{&quot;selector&quot;: 'dropdown-input'...}" />
<marker date="1497012610279" expanded="true" signature="5235:5699" ph="[...]" />
<marker date="1497012610279" expanded="true" signature="5249:5443" ph="{&quot;provide&quot;: forms_1.NG_VALUE_ACCESSOR...}" />
<marker date="1497012610279" expanded="true" signature="5457:5647" ph="{&quot;provide&quot;: forms_1.NG_VALIDATORS...}" />
<marker date="1497018845874" expanded="true" signature="1304:1658" ph="{...}" />
<marker date="1497018845874" expanded="true" signature="1768:1778" ph="{...}" />
<marker date="1497018845874" expanded="true" signature="4275:4348" ph="{...}" />
<marker date="1497018845874" expanded="true" signature="4447:4509" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="4577:4639" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="4707:4767" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="4832:4893" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="5936:6719" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="5936:6647" ph="{&quot;selector&quot;: 'dropdown-input'...}" />
<marker date="1497018845874" expanded="true" signature="6177:6641" ph="[...]" />
<marker date="1497018845874" expanded="true" signature="6191:6385" ph="{&quot;provide&quot;: forms_1.NG_VALUE_ACCESSOR...}" />
<marker date="1497018845874" expanded="true" signature="6399:6589" ph="{&quot;provide&quot;: forms_1.NG_VALIDATORS...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-750">
<caret line="43" column="37" lean-forward="false" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
<folding>
<element signature="e#0#85#0" expanded="true" />
<marker date="1497012606025" expanded="true" signature="513:626" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/counter-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
@@ -1185,14 +1134,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/custom-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/hidden-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
@@ -1201,16 +1142,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
<folding>
<marker date="1496824450537" expanded="true" signature="404:466" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textarea-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="763">
@@ -1220,9 +1151,67 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/textbox-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
<caret line="42" column="30" lean-forward="true" selection-start-line="42" selection-start-column="30" selection-end-line="42" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="58" column="36" lean-forward="true" selection-start-line="58" selection-start-column="36" selection-end-line="58" selection-end-column="36" />
<caret line="44" column="31" lean-forward="true" selection-start-line="44" selection-start-column="31" selection-end-line="44" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
<folding>
<marker date="1497013791538" expanded="true" signature="315:875" ph="..." />
<marker date="1497013791538" expanded="true" signature="364:733" ph="..." />
<marker date="1497013791538" expanded="true" signature="593:720" ph="..." />
<marker date="1497013791538" expanded="true" signature="762:863" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/tag-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="52" column="5" lean-forward="true" selection-start-line="52" selection-start-column="5" selection-end-line="52" selection-end-column="5" />
<folding>
<marker date="1497013791649" expanded="true" signature="404:466" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/custom-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="36" column="11" lean-forward="false" selection-start-line="36" selection-start-column="2" selection-end-line="36" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/dropdown-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="19" lean-forward="false" selection-start-line="57" selection-start-column="19" selection-end-line="57" selection-end-column="19" />
<folding>
<element signature="e#0#85#0" expanded="true" />
<marker date="1497018842009" expanded="true" signature="455:568" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/inputs/checkbox-input.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="10" column="125" lean-forward="false" selection-start-line="10" selection-start-column="125" selection-end-line="10" selection-end-column="125" />
<folding />
</state>
</provider>

1
src/app/app.component.ts
View File

@@ -43,5 +43,6 @@ export class AppComponent {
public submit(value: any) {
console.log('send', value);
this.valueService.postValues(this.uri, value, (data, err) => console.log("posted", data, err));
}
}

1
src/app/modules/dyn-form/dyn-form.component.ts
View File

@@ -26,7 +26,6 @@ export class DynFormComponent implements OnChanges {
private form: FormGroup;
public ngOnChanges(changes: SimpleChanges) {
console.log("changes form", changes);
if (changes['questions']) {
let controls = {};
for(let i = 0; this.questions && i < this.questions.length; i++) {

6
src/app/modules/dyn-form/inputs/checkbox-input.component.ts
View File

@@ -6,9 +6,9 @@ import {CustomInputComponent} from "./custom-input.component";
selector: 'checkbox-input',
template:
`
<label *ngIf="!readonly"><input type="radio" [checked]="value===true" (change)="onChange(true)">Yes</label><br/>
<label *ngIf="!readonly"><input type="radio" [checked]="value===false" (change)="onChange(false)">No</label><br/>
<label *ngIf="!readonly && nullable"><input type="radio" [checked]="value===null" (change)="onChange(null)">N/A</label><br/>
<label *ngIf="!readonly"><input type="radio" [checked]="value===true" (change)="onChange(true)">Yes</label><br *ngIf="!readonly"/>
<label *ngIf="!readonly"><input type="radio" [checked]="value===false" (change)="onChange(false)">No</label><br *ngIf="!readonly"/>
<label *ngIf="!readonly && nullable"><input type="radio" [checked]="value===null" (change)="onChange(null)">N/A</label>
<span *ngIf="readonly">{{value ? "Yes" : (value===false ? "No" : "N/A")}}</span>
`,
providers: [

26
src/app/modules/dyn-form/inputs/dropdown-input.component.ts
View File

@@ -2,7 +2,6 @@ import {Component, forwardRef, Input, OnChanges, SimpleChanges} from '@angular/c
import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormControl, ValidationErrors } from '@angular/forms';
import {CustomInputComponent} from "./custom-input.component";
import {ValueService} from '../services/value.service';
import {consoleTestResultHandler} from 'tslint/lib/test';
@Component({
selector: 'dropdown-input',
@@ -34,6 +33,7 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
@Input() foreign: {uri: string, keys: string, values: string, options?: {key: string, value: string}[]};
private listedItems: Array<{key: string, value: string}> = [];
private foreignItems: Array<{key: string, value: string}> = [];
private pendingForeign: boolean = false;
private constVal: string;
constructor(private valueService: ValueService) {
@@ -43,6 +43,7 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
// set initial value
public writeValue(obj: any): void {
this.value = obj;
console.log("write", this.value);
this.updateConst();
}
@@ -51,12 +52,24 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
this.setListedItems();
}
if (changes['foreign'] && this.foreign) {
this.pendingForeign = true;
this.valueService.getValues(this.foreign.uri, {}, (res, err) => {
this.foreignItems = [];
for (let item of res as any) {
this.foreignItems.push({key: item[this.foreign.keys], value: item[this.foreign.values]});
}
this.setListedItems();
setTimeout(() => {
const val = this.value;
this.value = "UNLIKY_VLAUEdrtwe53wrsdsfrsr3drw34rerw3raxdwgxcjlb234r";
setTimeout(() => {
this.value = val;
this.change(false);
this.pendingForeign = false;
console.log("after timeout", this.value);
}, 0);
}, 0);
});
}
}
@@ -66,6 +79,7 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
this.listedItems = [{key: "", value: "N/A"}, {key: null, value: "N/A"}].concat(this.items || []).concat(this.foreignItems || []);
else
this.listedItems = [].concat(this.items || []).concat(this.foreignItems || []);
console.log(this.listedItems, this.value);
this.updateConst();
}
@@ -82,6 +96,7 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
// validates the form, returns null when valid else the validation object
public validate(c: FormControl): ValidationErrors {
console.log(this.initComplete, this.value, this.listedItems);
if (!this.initComplete)
return null;
if (this.value===null) {
@@ -103,8 +118,15 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
// on button click
protected onChange(value: any): boolean {
this.value = value;
console.log("change", this.value);
super.change();
this.change();
return false;
}
protected touch() {
console.log("hehehe", this.pendingForeign);
if (!this.pendingForeign)
super.touch();
}
}

1
src/app/modules/dyn-form/inputs/tag-input.component.ts
View File

@@ -47,7 +47,6 @@ export class TagInputComponent extends CustomInputComponent {
this.value[key] = (this.nullable ? null : false);
}
}
console.log("writeValue", isUpdated, this.value);
if (isUpdated) {
setTimeout(() => this.change(true), 0);