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

Finished value service

Browse Source
This commit is contained in:
Sebastian Seedorf
2017-06-08 15:27:41 +02:00
parent 05fd2586fd
commit 1db9e839d3
2 changed files with 144 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
.idea/workspace.xml generated
View File

@@ -2,16 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="77c12afa-55f1-462c-96eb-1733ba14cab9" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/types/form.interface.ts" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/services/question.service.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/services/form.service.ts" />
<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-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/dyn-form.module.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/dyn-form.module.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/modules/dyn-form/services/value.service.ts" afterPath="$PROJECT_DIR$/src/app/modules/dyn-form/services/value.service.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/services/http-cached.service.ts" afterPath="$PROJECT_DIR$/src/app/services/http-cached.service.ts" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app/services/http.service.ts" afterPath="$PROJECT_DIR$/src/app/services/http.service.ts" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@@ -29,7 +21,7 @@
<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="391">
<state relative-caret-position="493">
<caret line="32" column="44" lean-forward="false" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
<folding />
</state>
@@ -49,17 +41,9 @@
<file leaf-file-name="app.component.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/app.component.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<state relative-caret-position="408">
<caret line="24" column="32" lean-forward="false" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
<folding>
<marker date="1496841033200" expanded="true" signature="984:2086" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1043:1961" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1592:1680" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1757:1953" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="2015:2058" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="2117:2319" ph="[...]" />
<marker date="1496841033200" expanded="true" signature="2140:2219" ph="{&quot;selector&quot;: 'my-app'...}" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -67,7 +51,7 @@
<file leaf-file-name="form.service.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/services/form.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<state relative-caret-position="51">
<caret line="8" column="26" lean-forward="false" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
<folding>
<element signature="e#0#43#0" expanded="true" />
@@ -79,8 +63,8 @@
<file leaf-file-name="http.service.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/services/http.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
<state relative-caret-position="272">
<caret line="18" column="1" lean-forward="false" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
@@ -91,8 +75,8 @@
<file leaf-file-name="value.service.ts" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/services/value.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
<caret line="15" column="14" lean-forward="true" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
<state relative-caret-position="306">
<caret line="48" column="15" lean-forward="true" selection-start-line="48" selection-start-column="15" selection-end-line="48" selection-end-column="15" />
<folding>
<element signature="e#0#43#0" expanded="true" />
</folding>
@@ -103,8 +87,8 @@
<file leaf-file-name="http-cached.service.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/services/http-cached.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<state relative-caret-position="323">
<caret line="22" column="41" lean-forward="false" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
@@ -115,8 +99,8 @@
<file leaf-file-name="http-base.service.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/services/http-base.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1416">
<caret line="94" column="38" lean-forward="true" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
<state relative-caret-position="1496">
<caret line="94" column="38" lean-forward="false" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
<folding />
</state>
</provider>
@@ -230,6 +214,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -384,8 +370,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -512,7 +496,8 @@
<workItem from="1496385401533" duration="17758000" />
<workItem from="1496408793177" duration="9778000" />
<workItem from="1496731076030" duration="19887000" />
<workItem from="1496819656295" duration="17341000" />
<workItem from="1496819656295" duration="18241000" />
<workItem from="1496903500356" duration="16941000" />
</task>
<task id="LOCAL-00001" summary="Merging">
<created>1496129612668</created>
@@ -556,11 +541,32 @@
<option name="project" value="LOCAL" />
<updated>1496824870337</updated>
</task>
<option name="localTasksCounter" value="7" />
<task id="LOCAL-00007" summary="Remote question and value service">
<created>1496843526473</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1496843526473</updated>
</task>
<task id="LOCAL-00008" summary="Finished value service">
<created>1496927880647</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1496927880647</updated>
</task>
<task id="LOCAL-00009" summary="Finished value service">
<created>1496928290088</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1496928290088</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="109381000" />
<option name="totallyTimeSpent" value="127222000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -573,17 +579,17 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1456" height="876" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.49435824" order="11" side_tool="false" content_ui="tabs" />
<window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25403225" sideWeight="0.49435824" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25599435" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.49717912" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.5070522" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.49153736" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3293011" sideWeight="0.49717912" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.49717912" order="2" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.49294782" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3293011" sideWeight="0.49294782" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -592,7 +598,6 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
@@ -657,14 +662,15 @@
<MESSAGE value="Specialization, Textbox" />
<MESSAGE value="submits only visible items" />
<MESSAGE value="Added checkbox input" />
<option name="LAST_COMMIT_MESSAGE" value="Added checkbox input" />
<MESSAGE value="Remote question and value service" />
<MESSAGE value="Finished value service" />
<option name="LAST_COMMIT_MESSAGE" value="Finished value service" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/app/services/http-cached.service.ts</url>
<properties />
<option name="timeStamp" value="2" />
</line-breakpoint>
</breakpoints>
@@ -696,9 +702,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="37" column="21" lean-forward="true" selection-start-line="37" selection-start-column="21" selection-end-line="37" selection-end-column="21" />
<folding>
<marker date="1496738970411" expanded="true" signature="343:363" ph="..." />
</folding>
</state>
</provider>
</entry>
@@ -716,7 +719,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@@ -732,7 +734,7 @@
<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="true" />
<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="..." />
@@ -754,7 +756,7 @@
<state relative-caret-position="357">
<caret line="21" column="27" lean-forward="true" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
<folding>
<element signature="e#0#69#0" expanded="true" />
<element signature="e#0#69#0" expanded="false" />
<marker date="1496823207959" expanded="true" signature="330:3061" ph="..." />
<marker date="1496823207959" expanded="true" signature="792:1097" ph="..." />
<marker date="1496823207959" expanded="true" signature="1147:1405" ph="..." />
@@ -779,9 +781,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
<folding>
<element signature="e#0#40#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -800,7 +800,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="55" lean-forward="false" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
@@ -832,7 +831,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
@@ -855,7 +853,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@@ -870,9 +867,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -916,7 +910,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@@ -924,7 +917,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="46" lean-forward="false" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
@@ -932,9 +924,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="38" column="18" lean-forward="false" selection-start-line="38" selection-start-column="18" selection-end-line="38" selection-end-column="18" />
<folding>
<marker date="1496738970411" expanded="true" signature="343:363" ph="..." />
</folding>
</state>
</provider>
</entry>
@@ -942,7 +931,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
@@ -950,9 +938,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="867">
<caret line="51" column="16" lean-forward="false" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="16" />
<folding>
<element signature="e#0#52#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -972,7 +957,7 @@
<state relative-caret-position="525">
<caret line="77" column="8" lean-forward="false" selection-start-line="77" selection-start-column="8" selection-end-line="77" selection-end-column="8" />
<folding>
<element signature="e#0#59#0" expanded="true" />
<element signature="e#0#59#0" expanded="false" />
<marker date="1496824450537" expanded="true" signature="404:466" ph="..." />
</folding>
</state>
@@ -992,7 +977,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="10" column="48" lean-forward="false" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
@@ -1000,7 +984,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
@@ -1009,7 +992,7 @@
<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="true" />
<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="..." />
@@ -1023,7 +1006,7 @@
<state relative-caret-position="1001">
<caret line="61" column="26" lean-forward="false" selection-start-line="61" selection-start-column="26" selection-end-line="61" selection-end-column="26" />
<folding>
<element signature="e#0#69#0" expanded="true" />
<element signature="e#0#69#0" expanded="false" />
<marker date="1496823207959" expanded="true" signature="330:3061" ph="..." />
<marker date="1496823207959" expanded="true" signature="792:1097" ph="..." />
<marker date="1496823207959" expanded="true" signature="1147:1405" ph="..." />
@@ -1040,23 +1023,14 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/app.component.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<state relative-caret-position="408">
<caret line="24" column="32" lean-forward="false" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
<folding>
<marker date="1496841033200" expanded="true" signature="984:2086" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1043:1961" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1592:1680" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="1757:1953" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="2015:2058" ph="{...}" />
<marker date="1496841033200" expanded="true" signature="2117:2319" ph="[...]" />
<marker date="1496841033200" expanded="true" signature="2140:2219" ph="{&quot;selector&quot;: 'my-app'...}" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -1070,15 +1044,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/app/services/http-base.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1416">
<caret line="94" column="38" lean-forward="true" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
<state relative-caret-position="1496">
<caret line="94" column="38" lean-forward="false" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/services/form.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<state relative-caret-position="51">
<caret line="8" column="26" lean-forward="false" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
<folding>
<element signature="e#0#43#0" expanded="true" />
@@ -1096,7 +1070,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/app/app.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<state relative-caret-position="493">
<caret line="32" column="44" lean-forward="false" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
<folding />
</state>
@@ -1112,8 +1086,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/app/services/http.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
<state relative-caret-position="272">
<caret line="18" column="1" lean-forward="false" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
@@ -1122,8 +1096,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/app/services/http-cached.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<state relative-caret-position="323">
<caret line="22" column="41" lean-forward="false" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
@@ -1132,8 +1106,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/app/modules/dyn-form/services/value.service.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
<caret line="15" column="14" lean-forward="true" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
<state relative-caret-position="306">
<caret line="48" column="15" lean-forward="true" selection-start-line="48" selection-start-column="15" selection-end-line="48" selection-end-column="15" />
<folding>
<element signature="e#0#43#0" expanded="true" />
</folding>

89
src/app/modules/dyn-form/services/value.service.ts
View File

@@ -21,12 +21,12 @@ export class ValueService {
cb(null, data.meta);
return;
}
cb(data.data[0], null);
cb(this.unflatObject(data.data[0]), null);
});
}
public getValues(path: string, filters: any, cb: (res: Object, err: any) => void) {
this.httpCachedService.getJSON(this.PREFIX+path, this.flatObject(filters), (data: ResponseInterface, e: Response | any) => {
public getValues(path: string, filters: {[_:string]: any}, cb: (res: Object, err: any) => void) {
this.httpCachedService.getJSON(this.PREFIX+path, this.flatObject(filters), (data, e) => {
if (e) {
cb(null, e);
return;
@@ -35,17 +35,67 @@ export class ValueService {
cb(null, data.meta);
return;
}
cb(data.data, null);
let ret = data.data;
for (let i=0; i<ret.length; i++)
ret[i] = this.unflatObject(ret[i]);
cb(ret, null);
});
}
private flatObject(obj: any, prefix?: string): {[_:string]: any} {
public postValues(path: string, values: {[_:string]: any}, cb: (res: Object, err: any) => void) {
this.httpCachedService.postJSON(this.PREFIX + path, {}, this.flatObject(values), (data, e) => {
if (e) {
cb(null, e);
return;
}
if (data.meta.code != 0) {
cb(null, data.meta);
return;
}
cb(this.unflatObject(data.data[0]), null);
});
}
public putValues(path: string, id: any, values: {[_:string]: any}, cb: (res: Object, err: any) => void) {
this.httpCachedService.putJSON(this.PREFIX+path+"/"+id, {}, this.flatObject(values), (data, e) => {
if (e) {
cb(null, e);
return;
}
if (data.meta.code != 0) {
cb(null, data.meta);
return;
}
cb(this.unflatObject(data.data[0]), null);
});
}
public deleteValues(path: string, id: any, cb: (res: Object, err: any) => void) {
this.httpCachedService.deleteJSON(this.PREFIX+path+"/"+id, {}, (data, e) => {
if (e) {
cb(null, e);
return;
}
if (data.meta.code != 0) {
cb(null, data.meta);
return;
}
cb(null, null);
});
}
private flatObject(obj: {[_:string]: any}, prefix: string = ''): {[_:string]: any} {
let ret: {[_:string]: any} = {};
if (!prefix)
prefix = '';
else
prefix = prefix+'.';
if (Object.prototype.toString.call(obj) == "[object Object]") {
if (prefix)
prefix = prefix+'.';
for (let key in obj) {
if (obj.hasOwnProperty(key)) {
ret = Object.assign(ret, this.flatObject(obj[key], prefix+key));
@@ -56,4 +106,25 @@ export class ValueService {
}
return ret;
}
private unflatObject(obj: {[_:string]: any}): {[_:string]: any} {
let ret: {[_:string]: any} = {};
for (let key in obj) {
if (obj.hasOwnProperty(key)) {
let strings: string[] = key.split('.');
ret = this.addValueToPath(ret, strings, obj[key]);
}
}
return ret;
}
private addValueToPath(obj: {[_:string]: any}, path: string[], value: any) {
let key = path.shift();
if (!path || !path.length)
return Object.assign(obj, {[key]: value});
if (!obj.hasOwnProperty(key))
obj[key] = {};
obj[key] = Object.assign(obj[key], this.addValueToPath(obj[key], path, value));
return obj;
}
}