diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 8604823..1b25432 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="PublishConfigData" serverName="amasson">
+ <component name="PublishConfigData" serverName="test local">
<serverData>
<paths name="amasson">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
+ <paths name="test local">
+ <serverdata>
+ <mappings>
+ <mapping local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </paths>
</serverData>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml
new file mode 100644
index 0000000..a5aa786
--- /dev/null
+++ b/.idea/vagrant.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VagrantProjectSettings">
+ <option name="instanceFolder" value="" />
+ <option name="provider" value="" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index bd41304..472b06c 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebServers">
<option name="servers">
- <webServer id="85da660e-e5cc-40ab-96cf-16c701e7bfa5" name="amasson" url="http://amasson/epfl">
+ <webServer id="85da660e-e5cc-40ab-96cf-16c701e7bfa5" name="amasson" url="https://amasson.ch/epfl">
<fileTransfer host="192.168.1.20" port="22" rootFolder="/amasson/html/epfl" accessType="SFTP">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" shareSSLContext="true" />
</advancedOptions>
<option name="port" value="22" />
</fileTransfer>
</webServer>
+ <webServer id="59e937d2-29b3-44c8-9206-23375a1c07c3" name="test local" url="http://localhost:63342">
+ <fileTransfer port="0" mountedRoot="C:\Users\almasson\Documents\c4science clone\costcalculator" accessType="MOUNT" />
+ </webServer>
</option>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dcb5d79..7a7070a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,455 +1,503 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="32058667-6761-4492-a704-290762d93e35" name="Default Changelist" comment="" />
+ <list default="true" id="32058667-6761-4492-a704-290762d93e35" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/css/costcalc.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/costcalc.css" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/js/back" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/js/costcalc_main.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/costcalc_main.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/js/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/data.js" afterDir="false" />
+ </list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="-1435277962">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="4" />
<entry key="project.open.time.16" value="1" />
<entry key="project.open.time.4" value="1" />
<entry key="project.open.time.8" value="1" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="4" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="back" value="1" />
<entry key="css" value="1" />
<entry key="html" value="3" />
<entry key="js" value="11" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="1" />
<entry key="HTML" value="3" />
<entry key="JavaScript" value="11" />
<entry key="PLAIN_TEXT" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="html" value="1223" />
<entry key="js" value="2620" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="HTML" value="1223" />
<entry key="JavaScript" value="2620" />
</counts>
</usages-collector>
</session>
<session id="-1962752238">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.open.time.4" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="html" value="7" />
<entry key="js" value="2702" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="HTML" value="7" />
<entry key="JavaScript" value="2702" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="JavaScript" value="1" />
</counts>
</usages-collector>
</session>
<session id="2130354723">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="2" />
+ <entry key="project.closed" value="4" />
<entry key="project.open.time.10" value="1" />
+ <entry key="project.open.time.17" value="1" />
<entry key="project.open.time.19" value="1" />
<entry key="project.open.time.2" value="1" />
+ <entry key="project.open.time.20" value="1" />
<entry key="project.open.time.9" value="1" />
- <entry key="project.opened" value="4" />
+ <entry key="project.opened" value="6" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
- <entry key="css" value="92" />
+ <entry key="css" value="167" />
<entry key="html" value="30" />
- <entry key="js" value="5019" />
+ <entry key="js" value="5617" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
- <entry key="CSS" value="92" />
+ <entry key="CSS" value="167" />
<entry key="HTML" value="30" />
- <entry key="JavaScript" value="5019" />
+ <entry key="JavaScript" value="5617" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="1" />
<entry key="js" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="1" />
<entry key="JavaScript" value="1" />
</counts>
</usages-collector>
</session>
</component>
<component name="FavoritesManager">
<favorites_list name="costcalc" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="98">
- <caret line="41" column="7" lean-forward="true" selection-start-line="41" selection-start-column="7" selection-end-line="41" selection-end-column="7" />
+ <state relative-caret-position="268">
+ <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/costcalc_main.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="559">
- <caret line="548" column="111" selection-start-line="548" selection-start-column="111" selection-end-line="548" selection-end-column="111" />
+ <state relative-caret-position="24">
+ <caret line="642" column="34" selection-start-line="642" selection-start-column="34" selection-end-line="642" selection-end-column="34" />
<folding>
<element signature="n#!!block;n#Repeat#0" />
<element signature="n#!!block;n#tonumeric#0" />
- <element signature="n#!!block;n#tomoney#0" />
<element signature="n#!!block;n#sum#0" />
<element signature="n#AmountInput#0" />
<element signature="n#SelectorInput#0" />
<element signature="n#CheckboxInput#0" />
+ <element signature="n#TxtInput#0" />
+ <element signature="n#CostOutput#0" />
+ <element signature="n#!!block;n#Textoutput#0" />
+ <element signature="n#AmountRatesCost#0" />
+ <element signature="n#CategoryAmountRatesCost#0" />
<element signature="n#!!block;n#makeinfo#0" />
- <element signature="n#ModuleHeader#0" />
- <element signature="n#ManagePlugins#0" />
- <element signature="n#PluginsMain#0" />
- <element signature="n#Main#0" />
</folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/costcalc.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="192">
- <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
+ <state relative-caret-position="1128">
+ <caret line="47" column="24" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/data.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-56">
- <caret line="231" column="14" selection-start-line="231" selection-start-column="14" selection-end-line="231" selection-end-column="14" />
+ <state relative-caret-position="7200">
+ <caret line="303" column="5" selection-start-line="303" selection-start-column="5" selection-end-line="303" selection-end-column="5" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="HTML File" />
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>console</find>
<find>tip</find>
<find>tooltip</find>
+ <find>url</find>
+ <find>icon</find>
+ <find>props.data.</find>
+ <find>data</find>
+ <find>ButtonInput</find>
</findStrings>
+ <replaceStrings>
+ <replace>Url</replace>
+ <replace>Icon</replace>
+ <replace>Data</replace>
+ </replaceStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/costcal.js" />
<option value="$PROJECT_DIR$/js/costcal.js" />
<option value="$PROJECT_DIR$/js/jquery.loan-calculator.js" />
<option value="$PROJECT_DIR$/js/back" />
<option value="$PROJECT_DIR$/js/jquery.nas-calculator.js" />
<option value="$PROJECT_DIR$/script.js" />
<option value="$PROJECT_DIR$/js/script.js" />
<option value="$PROJECT_DIR$/js/popper.-1.14.3.min.js" />
- <option value="$PROJECT_DIR$/js/data.js" />
<option value="$PROJECT_DIR$/index.html" />
- <option value="$PROJECT_DIR$/js/costcalc_main.js" />
+ <option value="$PROJECT_DIR$/js/data.js" />
<option value="$PROJECT_DIR$/css/costcalc.css" />
+ <option value="$PROJECT_DIR$/js/costcalc_main.js" />
</list>
</option>
</component>
<component name="JsBowerSettings">
<node-interpreter value="project" />
<bower-package value="" />
<bower.json value="" />
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsFlowSettings">
+ <service-enabled>true</service-enabled>
+ <exe-path />
+ <other-services-enabled>true</other-services-enabled>
+ <auto-save>true</auto-save>
+ </component>
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
- <component name="ProjectFrameBounds" extendedState="7">
- <option name="x" value="652" />
- <option name="y" value="197" />
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="296" />
+ <option name="y" value="208" />
<option name="width" value="1400" />
<option name="height" value="1028" />
</component>
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="1" id="Add" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="costcalculator" type="b2602c69:ProjectViewProjectNode" />
<item name="costcalculator" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="costcalculator" type="b2602c69:ProjectViewProjectNode" />
<item name="costcalculator" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="costcalculator" type="b2602c69:ProjectViewProjectNode" />
<item name="costcalculator" type="462c0819:PsiDirectoryNode" />
<item name="icons" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/index.html" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
- <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
+ <property name="nodejs_package_manager_path" value="npm" />
+ <property name="settings.editor.selected.configurable" value="configurable.group.build" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\almasson\WebstormProjects\costcalc\js" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\almasson\WebstormProjects\costcalc\js" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
- <configuration name="jquery.nas-calculator.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" nameIsGenerated="true" path-to-js-file="jquery.nas-calculator.js" working-dir="$PROJECT_DIR$/js">
+ <configuration default="true" type="EMBER_SERVE_CONFIGURATION" factoryName="Ember serve configuration factory">
+ <option name="PORT" value="" />
+ <option name="HOST" value="" />
+ <option name="ENVIRONMENT" value="development" />
+ <option name="OUTPUT_PATH" value="" />
+ <option name="WATCHER" value="" />
+ <option name="PROXY" value="" />
+ <option name="PROXY_SECURE" value="true" />
+ <option name="PROXY_TRANSPARENT" value="true" />
+ <option name="LIVE_RELOAD" value="true" />
+ <option name="LIVE_RELOAD_HOST" value="" />
+ <option name="LIVE_RELOAD_BASE_URL" value="" />
+ <option name="LIVE_RELOAD_PORT" value="" />
+ <option name="SSL" value="false" />
+ <option name="SSL_KEY" value="" />
+ <option name="SSL_CERT" value="" />
+ <method v="2" />
+ </configuration>
+ <configuration name="Unnamed" type="JavascriptDebugType" factoryName="JavaScript Debug" uri="http://localhost:63342/index.html?_ijt=guj9n9f47nlcpp7nsqo0ugkca2" useFirstLineBreakpoints="true">
<method v="2" />
</configuration>
- <recent_temporary>
- <list>
- <item itemvalue="Node.js.jquery.nas-calculator.js" />
- </list>
- </recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="32058667-6761-4492-a704-290762d93e35" name="Default Changelist" comment="" />
<created>1535982823834</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1535982823834</updated>
<workItem from="1535982828668" duration="19283000" />
<workItem from="1536218261639" duration="6867000" />
<workItem from="1536319807631" duration="928000" />
<workItem from="1536320859977" duration="9682000" />
<workItem from="1536564487126" duration="16495000" />
<workItem from="1536587075054" duration="5104000" />
<workItem from="1536649322932" duration="826000" />
<workItem from="1536667806952" duration="596000" />
<workItem from="1536829100586" duration="23501000" />
+ <workItem from="1537433681918" duration="7558000" />
+ <workItem from="1537443755183" duration="777000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="83282000" />
+ <option name="totallyTimeSpent" value="91617000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="57" y="-8" width="1871" height="1216" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4988263" visible="true" weight="0.18330605" />
<window_info id="Structure" order="1" sideWeight="0.50117373" side_tool="true" weight="0.2496329" />
<window_info id="Favorites" order="2" sideWeight="0.50117373" side_tool="true" weight="0.2496329" />
- <window_info anchor="bottom" id="File Transfer" visible="true" weight="0.27153558" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.3284091" />
<window_info anchor="bottom" id="Run" order="2" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39981273" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+ <window_info anchor="bottom" id="File Transfer" order="11" visible="true" weight="0.27153558" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/js/bootstrap.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/js/bootstrap.bundle.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/js/costcal.js" />
<entry file="file://$PROJECT_DIR$/js/jquery.loan-calculator.js" />
- <entry file="file://$PROJECT_DIR$/js/back">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5175">
- <caret line="225" column="7" selection-end-line="225" selection-end-column="7" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/js/back" />
<entry file="file://$PROJECT_DIR$/js/jquery-ui.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$USER_HOME$/Desktop/6668a1f6986742109c00a581ce704605-f6c882b6ae18bde42dcf6fdb751aae93495a2275/index.html" />
<entry file="file://$PROJECT_DIR$/js/jsonform.js" />
<entry file="file://$PROJECT_DIR$/js/like_button.js" />
<entry file="file://$PROJECT_DIR$/js/jquery.nas-calculator.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4872">
<caret line="208" column="10" selection-start-line="208" selection-start-column="10" selection-end-line="212" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/popper-1.14.3.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="5" selection-start-line="5" selection-end-line="5" />
- <folding>
- <element signature="n#!!doc" expanded="true" />
- </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/css/costcalc.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1128">
+ <caret line="47" column="24" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/data.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-56">
- <caret line="231" column="14" selection-start-line="231" selection-start-column="14" selection-end-line="231" selection-end-column="14" />
+ <state relative-caret-position="7200">
+ <caret line="303" column="5" selection-start-line="303" selection-start-column="5" selection-end-line="303" selection-end-column="5" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="268">
+ <caret line="18" column="43" lean-forward="true" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/js/costcalc_main.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="559">
- <caret line="548" column="111" selection-start-line="548" selection-start-column="111" selection-end-line="548" selection-end-column="111" />
+ <state relative-caret-position="24">
+ <caret line="642" column="34" selection-start-line="642" selection-start-column="34" selection-end-line="642" selection-end-column="34" />
<folding>
<element signature="n#!!block;n#Repeat#0" />
<element signature="n#!!block;n#tonumeric#0" />
- <element signature="n#!!block;n#tomoney#0" />
<element signature="n#!!block;n#sum#0" />
<element signature="n#AmountInput#0" />
<element signature="n#SelectorInput#0" />
<element signature="n#CheckboxInput#0" />
+ <element signature="n#TxtInput#0" />
+ <element signature="n#CostOutput#0" />
+ <element signature="n#!!block;n#Textoutput#0" />
+ <element signature="n#AmountRatesCost#0" />
+ <element signature="n#CategoryAmountRatesCost#0" />
<element signature="n#!!block;n#makeinfo#0" />
- <element signature="n#ModuleHeader#0" />
- <element signature="n#ManagePlugins#0" />
- <element signature="n#PluginsMain#0" />
- <element signature="n#Main#0" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="98">
- <caret line="41" column="7" lean-forward="true" selection-start-line="41" selection-start-column="7" selection-end-line="41" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/css/costcalc.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="192">
- <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
- </state>
- </provider>
- </entry>
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ScopeChooserConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
</component>
</project>
\ No newline at end of file
diff --git a/css/costcalc.css b/css/costcalc.css
index f63852b..b741a25 100644
--- a/css/costcalc.css
+++ b/css/costcalc.css
@@ -1,71 +1,78 @@
@media screen and (max-width: 768px) {
.lead {
font-size:25px;
}
}
@media screen and (max-width: 568px) {
.lead {
font-size:0.5em;
}
}
#plugin-name{
text-transform: capitalize;
font-size: $h2-font-size;
font-weight: bold;
}
#plugin-number{
font-size: large;
text-decoration: none;
}
#plugin-info{
font-size: large;
text-decoration: none;
text-align: center;
}
#plugin-cost{
text-align: center;
font-size: large;
;
}
#plugin-menu{
padding-top: 0.5em;
padding-bottom: 0.5em;
padding-left: 1em;
}
-#plugin-knowmore{
-
- padding-left: 0em;
- /*padding-right: 1em;*/
+#plugin-knowmore {
+ padding-top: 0em;
+ padding-bottom: 0em;
+ padding-left: 0.1em;
+ padding-right: 0.1em;
+}
+#plugin-add{
+ padding-top: 0em;
+ padding-bottom: 0em;
+ padding-left: 0.1em;
+ padding-right: 0.1em;
}
#ccost{
text-align: center;
font-size: large;
}
#module-name{
font-weight: bold;
}
#component{
padding-top: 1em;
padding-bottom: 1em;
padding-left: 1em;
padding-right: 1em;
}
#infotxt{
text-align: center;
}
#service{
font-size: medium;
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
text-align: center;
}
#ctotal{
text-align: center;
font-size: $h2-font-size;
font-weight: bold;
}
\ No newline at end of file
diff --git a/docs/configure.md b/docs/configure.md
new file mode 100644
index 0000000..e69de29
diff --git a/icons/plus.png b/icons/plus.png
new file mode 100644
index 0000000..9897cf2
Binary files /dev/null and b/icons/plus.png differ
diff --git a/icons/sliders.png b/icons/sliders.png
new file mode 100644
index 0000000..2dbf75e
Binary files /dev/null and b/icons/sliders.png differ
diff --git a/js/back b/js/back
deleted file mode 100644
index 9d09ef5..0000000
--- a/js/back
+++ /dev/null
@@ -1,226 +0,0 @@
-
- "use strict";
-
-/*
- const NASPERF_RATES = {
- 'Collaborative': 165,
- 'On-line archive': 110,
- 'Raw': 55
- };
-
- const MINIMUM_AMOUNT = 1;
-*/
-
-/* const defaults = {
- // default values for a nas
- nasAmount: 1,
- nasperfRates: NASPERF_RATES,
- nasperf: 'Collaborative',
-
-
- // inputs
- nasAmountSelector: '#nas-amount',
- nasperfSelector: '#nas-perf',
-
-
- // display selected values
- selectedAmount: '#nac',
- selectedRate: '#npr',
-
-
- // display the results
- nascost: '#nas-cost'
- };*/
-
- /**
- * The actual plugin constructor
- * @param {Object} element
- * @param {Object} options
- */
- function Plugin(element, options) {
- log.console("plugins0");
- this.$el = $(element);
- this._name = 'NasCalculator';
- this._defaults = defaults;
- this.settings = $.extend({}, defaults, options);
- this.attachListeners();
- this.init();
- log.console("plugins");
- }
-
- // Avoid Plugin.prototype conflicts
- /* $.extend(Plugin.prototype, {
- //
- /!**
- * Validates the data and shows the results.
- * @return {void}
- *!/
- init: function () {
- this.validate();
- this.render();
- console.log('init');
- },
-
- /!**
- * Attach event listeners to the event handlers.
- * @return {void}
- *!/
- attachListeners: function () {
- var eventEmitters = [
- this.settings.nasAmountSelector,
- this.settings.nasperfSelector,
- ];
-
- $(eventEmitters.join()).on({
- change : this.eventHandler.bind(this),
- mousemove : this.eventHandler.bind(this),
- touchmove : this.eventHandler.bind(this)
- });
- },
-
- /!**
- * Handle events from the DOM.
- * @return {void}
- *!/
- eventHandler: function () {
- this.update({
- nasAmount : this.$el.find(this.settings.nasAmountSelector).val(),
- nasperf : this.$el.find(this.settings.nasperfSelector).val()
-
- });
- },
-
- /!**
- * Sanitize and validate the user input data.
- * @throws Error
- * @return {void}
- *!/
- validate: function () {
- if (typeof this.settings.nasAmount === 'string') {
- this.settings.nasAmount = this._toNumeric(this.settings.nasAmount);
- }
-
- if (! $.isPlainObject(this.settings.nasperfRates)) {
- throw new Error('The value provided for [nasperfRates] is not valid.');
- }
-
- for (var perfRate in this.settings.nasperfRates) {
- if (typeof this.settings.nasperfRates[perfRate] === 'string') {
- this.settings.nasperfRates[perfRate] = this._toNumeric(this.settings.nasperfRates[perfRate]);
- }
-
- if (! $.isNumeric(this.settings.nasperfRates[perfRate])) {
- throw new Error('The value provided for [nasperfRates] is not valid.');
- }
-
- if (this.settings.nasperfRates[perfRate] < 1) {
- this.settings.nasperfRates[perfRate] = this.settings.nasperfRates[perfRate] * 100;
- }
- }
-
- // Sanitize the input
- this.settings.nasAmount = parseFloat(this.settings.nasAmount);
-
-
- if (! this.settings.nasperfRates.hasOwnProperty(this.settings.nasperf)) {
- throw new Error('The value provided for [nasperf] is not valid.');
- }
-
- if (this.settings.nasAmount < MINIMUM_AMOUNT) {
- throw new Error('The value provided for [nasAmount] must me at least the minimum.');
- }
-
- },
-
- /!**
- * Show the results in the DOM.
- * @return {void}
- *!/
- render: function () {
- this._displaySelectedValues();
- this._displayResults();
- console.log('render');
-
- },
-
- /!**
- * Show the selected values in the DOM.
- * @return {void}
- *!/
- _displaySelectedValues: function () {
- // Display the selected nas amount
- this.$el.find(this.settings.selectedAmount).html(
- this.settings.nasAmount
- );
-
- // Display the selected performances
- this.$el.find(this.settings.selectedRate).html(
- this.settings.nasperfSelector
- );
-
-
- },
-
- /!**
- * Display the results for the current values.
- * @return {void}
- *!/
- _displayResults: function () {
- // Display the loan total
- this.$el.find(this.settings.nascost).html(
- this._toMoney(this._nasTotal())
- );
- console.log('results');
-
- },
-
-
- _nasTotal: function (){
-
- console.log('nastot');
-
- return 100;
- },
-
- /!**
- * Convert numeric format to money format.
- * @param {Number} numeric
- * @return {String}
- *!/
- _toMoney: function (numeric) {
- if (typeof numeric == 'string') {
- numeric = parseFloat(numeric);
- }
-
- return numeric.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') + 'CHF';
- },
-
- /!**
- * Convert from money format to numeric format.
- * @param {String} value
- * @return {Number}
- *!/
- _toNumeric: function (value) {
- return parseFloat(
- value.toString().replace(/[^0-9\.]+/g, '')
- );
- },
-
- /!**
- * To convert the provided value to percent format.
- * @param {Number} numeric
- * @returns {String}
- *!/
- _toPercentage: function (numeric) {
- return (numeric * 100).toFixed(2) + '%';
- }
-
- });
-
-*/
- /*!
- * jQuery Nas Calculator
- *
- * Author: J
- * Released under the MIT license - https://opensource.org/licenses/MIT
- */
\ No newline at end of file
diff --git a/js/costcalc_main.js b/js/costcalc_main.js
index 21eb756..62fe1d0 100644
--- a/js/costcalc_main.js
+++ b/js/costcalc_main.js
@@ -1,794 +1,802 @@
'use strict';
// Functions Tools
// ---------------------
// ---------------------
function Repeat(props) {
let items = [];
for (let i = 0; i < props.numTimes; i++) {
items.push(props.children(i));
}
return <div>{items}</div>;
}
function tonumeric (value) {
return parseFloat(
value.toString().replace(/[^0-9\.]+/g, '')
);
}
function tomoney(numeric) {
if (typeof numeric == 'string') {
numeric = parseFloat(numeric);
}
- return numeric.toFixed(0).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') + ' CHF';
+ return numeric.toFixed(0).replace(/(\d)(?=(\d{3})+\.)/g, '$1,') + ' '+MainData.Currency;
}
function sum(obj) {
const val=Object.values(obj);
var total = 0;
for (var i = 0; i < val.length; i++) {
total = total + tonumeric(val[i]);
}
return total;
}
// Inputs Definition
// ---------------------
// ---------------------
class AmountInput extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
}
handleChange(e) {
this.props.onChange(e.target.value);
}
render() {
const value = this.props.value;
return (
<div className="col" >
<span data-toggle="tooltip" data-placement="top" title={this.props.tips}>
<label htmlFor={this.props.id}> {this.props.name} </label>
<input type="range" className="form-control-range" id={this.props.id} min={this.props.min} max={this.props.max}
step={this.props.step} value={value} onChange={this.handleChange}/>
<small id="nas-amount-cost" className="form-text text-muted">Amount : {value} {this.props.unit} </small>
</span>
</div>
);
}
}
-
class SelectorInput extends React.Component {
constructor(props) {
super(props);
// this.state={listoptions:this.makelist(props.options)};
this.handleChange = this.handleChange.bind(this);
}
rate(i){
return i;
// if(this.props.rate==null){
// return i;
// }else{
// return this.props.rate[i];
// }
}
makelist(data){
var listoptions=[];
for (var i = 0; i < data.length; i++) {
listoptions.push(<button className="dropdown-item btn-success " type="button" key={i} value={this.rate(i)} onClick={this.handleChange}>{data[i]}</button>);
}
return listoptions;
}
handleChange(select) {
this.props.onChange(select.target.value);
}
makerate(){
if (this.props.rate!=null){
return( <small id="nas-amount-cost" className="form-text text-muted">Rate : {this.props.rate} {this.props.unit}</small> );}
}
maketitle(title){
const maxstr=20
if (title.length>maxstr){
title=title.substr(0,maxstr)+"...";
}
return title;
}
render() {
return (
<div className="Container">
<div className="row">
<label htmlFor={this.props.id}> {this.props.name} </label>
</div>
<div className="row">
<div className="btn-group">
<a className={"btn "+this.props.class+" dropdown-toggle"} href="#" role="button" id={this.props.id} data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" >
<span data-toggle="tooltip" data-placement="top" title={this.props.tips}>
{this.maketitle(this.props.options[this.props.selected])}
</span>
</a>
<div className="dropdown-menu" aria-labelledby={this.props.id}>
{this.makelist(this.props.options)}
</div>
</div>
</div>
<div className="row">
{this.makerate()}
</div>
</div>
)
}
}
class MakeknowmoreInput extends React.Component {
constructor(props) {
super(props);
+ this.state={btnsize:20}
}
render() {
const data = this.props.data;
const n = this.props.n;
- if (((data.url != '') || (data.url == null)) && (n == 0)) {
- if (data.url.length==1){
- return(
- <ButtonHrefInput name={<img src="./icons/info.png" height="20" width="20"/>} url={data.url[0].url}
- id="btn-plugin-knowmore"
- class="btn-primary" tips={"Know more about " + data.name}/>
- );
- }else {
- return (<MenuInput name={<img src="./icons/info.png" height="20" width="20"/>} options={data.url}
+ if (((data.Url != '') || (data.Url == null)) && (n == 0)) {
+ // if (data.Url.length==1){
+ // return(
+ // <ButtonHrefInput name={<img src="./icons/info.png" width={this.state.btnsize}/>} url={data.Url[0].Url}
+ // id="btn-plugin-knowmore"
+ // class="btn-primary btn-sm" tips={"Know more about " + data.Name}/>
+ // );
+ // }else {
+ return (<MenuInput name={<img src="./icons/info.png" width={this.state.btnsize}/>} options={data.Url}
id="btn-plugin-knowmore"
- class="btn-primary" tips={"Know more about " + data.name}/>);}
+ class="btn-primary btn-sm" tips={"Know more about " + data.Name}/>);
+ //}
}
else{
return null
}
}
}
class CheckboxInput extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
this.state={checked:this.props.defaults};
}
handleChange() {
this.setState({checked: !this.state.checked});
this.props.onChange(!this.state.checked);
}
render() {
return (
<div className="form-check">
<input className="form-check-input" type="checkbox" id={this.props.id} onChange={this.handleChange}
defaultChecked={this.state.checked}/>
<label className="form-check-label" htmlFor={this.props.id}>{this.props.name}</label>
</div>
);
}
}
class ButtonHrefInput extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<a id={this.props.id} href={this.props.url} type="button" className="btn btn-primary" data-toggle="tooltip" data-placement="top" title={this.props.tips} aria-disabled="true" target="_blank">{this.props.name}</a>
);
}
}
class ButtonInput extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
}
handleChange() {
this.props.onClick(this.props.n);
}
render() {
return (
- <button id={this.props.id} onClick={this.handleChange} type="button" className="btn btn-primary" data-toggle="tooltip" data-placement="top" title={this.props.tips}>{this.props.name}</button>
+ <div>
+ <button id={this.props.id} onClick={this.handleChange} type="button" className={"btn "+ this.props.class} data-toggle="tooltip" data-placement="top" title={this.props.tips}>{this.props.name}</button>
+ </div>
);
}
}
class MenuInput extends React.Component {
constructor(props) {
super(props);
this.state={listoptions:this.makelist(props.options)};
}
makelist(data){
var listoptions=[];
for (var i = 0; i < data.length; i++) {
- listoptions.push(<a className="dropdown-item" href={data[i].url} key={data[i].name} target="_blank">{data[i].name}</a>);
+ listoptions.push(<a className="dropdown-item" href={data[i].Url} key={data[i].Name} target="_blank">{data[i].Name}</a>);
}
return listoptions;
}
render() {
return (
<div className="btn-group">
<a className={"btn "+this.props.class+" btn-sm dropdown-toggle"} href="#" role="button" id={this.props.id} data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" >
<span data-toggle="tooltip" data-placement="top" title={this.props.tips}>
{this.props.name}
</span>
</a>
<div className="dropdown-menu" aria-labelledby={this.props.id}>
{this.state.listoptions}
</div>
</div>
);
}
}
class TxtInput extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
}
handleChange(e) {
this.props.onChange(e.target.value);
}
render() {
const value = this.props.value;
return (
<div className="col">
<label htmlFor={this.props.id}> {this.props.name} </label>
<input type="text" className="form-control" id="formGroupExampleInput" placeholder={this.props.placeholder} onChange={this.handleChange} value={value}
data-toggle="tooltip" data-placement="top" title={this.props.tips}/>
</div>
);
}
}
// Outputs definition
// ---------------------
// ---------------------
class CostOutput extends React.Component {
constructor(props) {
super(props);
this.handleChange = this.handleChange.bind(this);
}
handleChange() {
this.props.onCostChange(this.props.display);
}
render() {
return (
<div className={"form-group row align-items-center"}>
<label htmlFor={this.props.id} className={"col-form-label"}>{this.props.name}</label>
<div className="col align-self-center">
<input type={"text"} className={"form-control"} id={this.props.id} className={"form-control"}
value={this.props.value} onChange={this.handleChange} readOnly data-toggle="tooltip" data-placement="top" title={this.props.tips}/>
</div>
</div>
);
}
}
function Textoutput(props){
return(
<div className="alert alert-primary" role="alert" data-toggle="tooltip" data-placement="top" title="Expand this...">
{props.text}
</div>
);
}
// Plugins definition
// ---------------------
// ---------------------
class AmountRatesCost extends React.Component {
constructor(props) {
super(props);
this.state={amount : 1, SelectRate : 0 , Rate : this.props.data.Rates[Object.keys(this.props.data.Rates)[0]]};
this.handleAmountChange = this.handleAmountChange.bind(this);
this.handleRateChange = this.handleRateChange.bind(this);
}
handleAmountChange(amount) {
this.setState({amount: amount});
}
handleRateChange(select) {
this.setState({SelectRate: select});
this.setState({Rate: this.props.data.Rates[Object.keys(this.props.data.Rates)[select]]});
}
render() {
const Amount = this.state.amount;
const Rate=this.state.Rate;
const Cost=this.makecost(Amount,Rate);
return (
<div className="row align-items-center">
<div className="col">
<AmountInput id={this.props.name} min={this.props.data.AmountMin} max={this.props.data.AmountMax}
step={this.props.data.AmountStep} value={Amount} name={this.props.data.AmountName}
unit={this.props.data.AmountUnit} onChange={this.handleAmountChange} tips="Select the desired amount"/>
</div>
<div className="col-3">
<SelectorInput id={this.props.name+'-Rates'} name={this.props.data.RateName} options={Object.keys(this.props.data.Rates)}
class="btn-secondary" selected={this.state.SelectRate} rate={Rate} unit={this.props.data.RateUnit} onChange={this.handleRateChange} />
</div>
{/*<CostOutput id={this.props.name+'-Cost'} name={"Cost"} value={Cost} />*/}
</div>
);
}
makecost(amount,rate) {
if (amount<=this.props.data.AmountFree){
amount=0;
}
var total=amount*rate;
total=tomoney(total);
this.props.onCostChange(this.props.n,total);
return total;
}
}
class CategoryAmountRatesCost extends React.Component {
constructor(props) {
super(props);
this.state={SelectCat : 0, Cat : this.props.data.Cat[Object.keys(this.props.data.Cat)[0]],
amount : 1, SelectRate : 0 , Rate : this.props.data.Rates[Object.keys(this.props.data.Rates)[0]]};
this.handleCatChange = this.handleCatChange.bind(this);
this.handleAmountChange = this.handleAmountChange.bind(this);
this.handleRateChange = this.handleRateChange.bind(this);
// this.handleCostChange = this.handleCostChange.bind(this);
}
handleAmountChange(amount) {
this.setState({amount: amount});
}
handleRateChange(select) {
this.setState({SelectRate: select});
this.setState({Rate: this.props.data.Rates[Object.keys(this.props.data.Rates)[select]]});
}
handleCatChange(select) {
this.setState({SelectCat: select});
this.setState({Cat: this.props.data.Cat[Object.keys(this.props.data.Cat)[select]]});
}
render() {
const Cat=this.state.Cat;
const Amount = this.state.amount;
const Rate=this.state.Rate;
const Cost=this.makecost(Cat,Amount,Rate);
return (
<div className="row align-items-center">
<div className="col-3">
<SelectorInput id={this.props.name+'-category'} name={this.props.data.CatName} options={Object.keys(this.props.data.Cat)} rate={Cat}
class="btn-secondary" selected={this.state.SelectCat} unit={this.props.data.CatUnit} onChange={this.handleCatChange} />
</div>
<div className="col-4">
<AmountInput id={this.props.name} min={this.props.data.AmountMin} max={this.props.data.AmountMax} step={this.props.data.AmountStep}
value={Amount} name={this.props.data.AmountName} unit={this.props.data.AmountUnit} onChange={this.handleAmountChange} />
</div>
<div className="col-4">
<SelectorInput id={this.props.name+'-Rates'} name={this.props.data.RateName} options={Object.keys(this.props.data.Rates)} rate={Rate}
class="btn-secondary" selected={this.state.SelectRate} unit={this.props.data.RateUnit} onChange={this.handleRateChange} />
</div>
{/*<CostOutput id={this.props.name+'-Cost'} name={"Cost"} value={Cost} />*/}
</div>
);
}
makecost(cat,amount,rate) {
if (amount<=this.props.data.AmountFree){
amount=0;
}
var total=cat+amount*rate;
total=tomoney(total);
this.props.onCostChange(this.props.n,total);
return total;
}
}
class CategoryCost extends React.Component {
constructor(props) {
super(props);
this.state={SelectCat : 0, Cat : this.props.data.Cat[Object.keys(this.props.data.Cat)[0]]};
this.handleCatChange = this.handleCatChange.bind(this);
}
handleCatChange(select) {
this.setState({SelectCat: select});
this.setState({Cat: this.props.data.Cat[Object.keys(this.props.data.Cat)[select]]});
}
render() {
const Cat=this.state.Cat;
const Cost=this.makecost(Cat);
return (
<div className="row align-items-center">
<div className="col-4">
<SelectorInput id={this.props.name+'-category'} name={this.props.data.CatName} options={Object.keys(this.props.data.Cat)} rate={Cat}
class="btn-secondary" selected={this.state.SelectCat} unit={this.props.data.CatUnit} onChange={this.handleCatChange} />
</div>
</div>
);
}
makecost(cat) {
var total=cat;
total=tomoney(total);
this.props.onCostChange(this.props.n,total);
return total;
}
}
class NoneSelect extends React.Component {
constructor(props) {
super(props);
}
render() {
const Cost=tomoney(0);
this.props.onCostChange(this.props.n,Cost);
return (<div className="alert alert-info" id="infotxt">
Please select a provider in the list.
</div>
);
}
}
// Combine plugins
// ---------------------
// ---------------------
class ProviderPluginsSelector extends React.Component {
constructor(props) {
super(props);
this.handleCostChange = this.handleCostChange.bind(this);
this.handleProviderChange = this.handleProviderChange.bind(this);
this.handleCommentChange = this.handleCommentChange.bind(this);
this.handleAddPlugin = this.handleAddPlugin.bind(this);
this.state={
selected:0,
keys:this.ProvidersName(props.data),
enabled :true,
n:1,
cost:0,
prevcost:0,
comments:"",
};
}
handleCostChange(n,e) {
// console.log("here n : "+n+" e = "+ e);
if(! this.state.enabled){
e=0;
}
if (this.state.prevcost != e ) {
this.setState({cost: e});
this.setState({prevcost: e});
this.props.handleCostChange(n,e);}
}
handleProviderChange(select){
this.setState({selected:select});
// this.setState({Cdata:this.cmpdata(this.state.selected)});
// this.setSate({kmm:this.makemenu(this.state.Cdata,0)});
}
handleCommentChange(com){
this.setState({comments:com});
}
handleAddPlugin(n){
this.props.handleAddPlugin(n);
}
render() {
// console.log("n= "+this.props.n)
- const Cmp=this.cmp2string(this.cmpdata(this.state.selected).style);
+ const Cmp=this.cmp2string(this.cmpdata(this.state.selected).Style);
const Cdata=this.cmpdata(this.state.selected);
- const id=this.props.data.name.replace(/\s/g,'')+this.props.n;
+ const id=this.props.data.Name.replace(/\s/g,'')+this.props.n;
const selected=this.state.selected;
return(
<div id={"plugin"}>
<div className="card-header" id={id}>
<ModuleHeader id={id} data={this.props.data} selected={selected} Cdata={Cdata} n={this.props.n} Cost={this.state.cost}
comments={this.state.comments} handleAddPlugin={this.handleAddPlugin} keys={this.state.keys}/>
</div>
<div id={"collapse"+id} className="collapse" aria-labelledby={id} data-parent="#accordion">
<div className="card-body">
<div className="container">
<div className="row align-items-end">
<div id="provider-selector" className="col-auto">
<SelectorInput id="providerselect" name="Select a provider" selected={selected} options={this.state.keys}
class="btn-primary lg-btn" onChange={this.handleProviderChange} tips="Select a provider"/>
- </div>
- <div className="col-1">
- <MakeknowmoreInput key={selected} data={Cdata} truc={Cmp} name="" n="0" />
+ {/*</div>*/}
+ {/*<div className="col-sm-auto">*/}
+ <MakeknowmoreInput key={selected} data={Cdata} name="" n="0" />
</div>
<div className="col-4">
<TxtInput id="module-comments" name="My Comments" placeholder="I can put a comment here..." onChange={this.handleCommentChange}/>
</div>
</div>
</div>
<div id="component" className="container bg-light">
<Cmp data={Cdata} key={selected} name="" onCostChange={this.handleCostChange} n={this.props.n} />
</div>
</div>
</div>
</div>
);
}
- cmpdata(select){return this.props.data.data[select];}
+ cmpdata(select){return this.props.data.Data[select];}
cmp2string(str){
+
switch (str) {
case "AmountRatesCost" : return AmountRatesCost;
case "CategoryCost" : return CategoryCost;
case "CategoryAmountRatesCost" : return CategoryAmountRatesCost;
case "NoneSelect":return NoneSelect;
}
}
ProvidersName(main){
- const data = main.data;
+ const data = main.Data;
// console.log(data);
var providers=[];
for (var i = 0; i < data.length; i++) {
- providers.push(data[i].provider);
+ providers.push(data[i].Provider);
}
return providers;
}
}
function makeinfo(keys,selected,Cdata){
if (selected>0){
return (<span><span id="module-provider">{keys[selected]} : </span> <span id="module-name">{Cdata.name}</span></span>);
}
else {
return (<span id="module-name">{Cdata.name}</span>);
}
}
class ModuleHeader extends React.Component{
constructor(props) {
super(props);
this.handleAddPlugin = this.handleAddPlugin.bind(this);
}
handleAddPlugin(n){
this.props.handleAddPlugin(n);
}
render() {
return(
<div className="container">
<div className="row align-items-center">
+ <div className="col-1 align-self-start">
+ <div id="plugin-add">
+ <ButtonInput class="btn-success btn-sm" id="plugins-add-btn" name={<img className="img-fluid" src="icons\plus.png" width="20"/>} onClick={this.handleAddPlugin} n={this.props.n} tips={"Add a new "+this.props.data.Name}/>
+ </div>
+ <div id="plugin-knowmore">
+ <MakeknowmoreInput data={this.props.data} n={this.props.n}/>
+ </div>
+ </div>
<div className=" col-1 align-self-start">
- <img className="img-fluid" src={"icons/"+this.props.data.icon}/>
+ <img className="img-fluid" src={"icons/"+this.props.data.Icon} width="100"/>
</div>
- <div className="col-4 ">
+ <div className="col-3 ">
<div className="row align-items-end">
<div className="col-auto">
<span data-toggle="tooltip" data-placement="top" title="Expand this..." >
<button className="btn btn-outline-primary dropdown-toggle" type="button" data-toggle="collapse" data-target={"#collapse"+this.props.id}
aria-expanded="false" aria-controls={"collapse"+this.props.id} id="btn-plugins" >
- <span id={"plugin-number"}> {this.props.n+1}. </span> <span id={"plugin-name"}>{this.props.data.name}</span>
+ <span id={"plugin-number"}> {this.props.n+1}. </span> <span id={"plugin-name"}>{this.props.data.Name}</span>
</button>
</span>
- </div>
- <div id="plugin-knowmore"className="col-1">
- <MakeknowmoreInput data={this.props.data} n={this.props.n}/>
+
</div>
</div>
</div>
- <div id="plugin-info" className="col-4">
+ <div id="plugin-info" className="col-3">
<div className="row">
{makeinfo(this.props.keys,this.props.selected,this.props.Cdata,this.props.n)}
</div>
<div className="row">
{this.props.comments}
</div>
</div>
<div id="plugin-cost" className="col-2 align-self-end">
<CostOutput id="ccost" name={"Cost"} value={this.props.Cost} tips="Total cost for this provider"/>
</div>
- <div className="col-1 align-self-end">
- <ButtonInput id={"add-btn"} name={"+"} onClick={this.handleAddPlugin} n={this.props.n} tips={"Add a new "+this.props.data.name}/>
- </div>
</div>
</div>
);
}
}
class ManagePlugins extends React.Component{
constructor(props) {
super(props);
this.handleCostChange = this.handleCostChange.bind(this);
this.handleAddPlugin = this.handleAddPlugin.bind(this);
this.handleRemovePlugin = this.handleRemovePlugin.bind(this);
this.state={
n:1,
'varsum':{}
};
}
handleRemovePlugin(key){
const n=this.state.n+1;
this.setState({n:n});
}
handleAddPlugin(key){
const n=this.state.n+1;
this.setState({n:n});
}
handleCostChange(name,e) {
this.state.varsum[name]=e;
this.props.handleCostChange(this.props.n,sum(this.state.varsum));
}
render() {
return(
<Repeat numTimes={this.state.n}>
{(index) => <ProviderPluginsSelector data={this.props.data} key={index}
n={index} handleCostChange={this.handleCostChange} handleAddPlugin={this.handleAddPlugin}/>}
</Repeat>
);}
}
class PluginsMain extends React.Component {
constructor(props) {
super(props);
this.handleCostChange = this.handleCostChange.bind(this);
this.state={'varsum':{}};
}
handleCostChange(name,e) {
// console.log("name"+name);
this.state.varsum[name]=e;
this.props.TotalCost(sum(this.state.varsum));
}
render() {
return(
<div className="card">
<Repeat numTimes={this.props.data.length}>
{(index) => <ManagePlugins data={this.props.data[index]} key={index}
n={index} handleCostChange={this.handleCostChange}/>}
</Repeat>
</div>
);
}
}
// ---------------------
// ---------------------
class Main extends React.Component {
constructor(props) {
super(props);
this.handleCostChange = this.handleCostChange.bind(this);
this.state={'total':0,'prevtotal':0};
}
handleCostChange(total) {
// console.log("there total : "+total )
if (this.state.prevtotal != total){
// console.log("updated :"+total);
// console.log("prev :"+this.state.prevtotal);
this.setState({'total':total});
this.setState({'prevtotal':total});
}
}
render() {
return(
<form>
<div className={"container"}>
<div className={"accordion"} id={"accordion"}>
- <PluginsMain TotalCost={this.handleCostChange} data={maincat.data}/>
+ <PluginsMain TotalCost={this.handleCostChange} data={MainData.Data}/>
</div>
<div className="card" id="finalcost">
<div className="card-header">
<div className="container row">
<div className="col-7 align-self-start" id="plugin-name">
Total Cost
</div>
<div id="plugin-cost" className="col-5 text-right">
<CostOutput name={"Total Cost per year"} id={"ctotal"} value={tomoney(this.state.total)} tips="Total cost per year"/>
</div>
</div>
</div>
<div className="card-body">
</div>
<div className="card-footer">
<div className="alert alert-danger" role="alert" id="infotxt">
- The information published on this service are only informative.
+ The values published on this service are only informative and cannot be used for exact calculation. If you see some mistake or would like to
+ have another services please contact us.
</div>
<div id="service">
<p>This service has been developed by ... 2018 </p>
<p>Icons are from the Noun Project (Book by Randi NI, Storage by I Pitu, Database by Novalyi, data cloud by Vectors Market)</p>
</div>
</div>
</div>
</div>
</form>
);
}
}
// ---------------------
// ---------------------
ReactDOM.render(<Main />,document.getElementById('root'));
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
\ No newline at end of file
diff --git a/js/data.js b/js/data.js
index ff68ec9..d065bb4 100644
--- a/js/data.js
+++ b/js/data.js
@@ -1,332 +1,333 @@
// Providers
// ----------------------------------------------------
// ----------------------------------------------------
// Storage
const NasEpfl = {
- style: "AmountRatesCost",
- provider : "EPFL-VPSI",
- name:'NAS',
- url : [
- {name:'VPSI-Website',url:'https://support.epfl.ch/help/epfl?id=epfl_service_status&service=49a363acdb34c700ef64731b8c96191f'}
+ Style: "AmountRatesCost",
+ Provider : "EPFL-VPSI",
+ Name:'NAS',
+ Url : [
+ {Name:'VPSI-Website',Url:'https://support.epfl.ch/help/epfl?id=epfl_service_status&service=49a363acdb34c700ef64731b8c96191f'}
],
AmountName: "Amount",
AmountUnit: "TB",
AmountMin : 1,
AmountMax : 100,
AmountStep : 1,
AmountFree:1,
AmountFreeCumulative:false,
RateVar : true,
RateName : 'Performance',
Rates : {
'Collaborative': 165,
'On-line archive': 110,
'Raw': 55
},
RateUnit : "CHF / TB"
};
const SwitchEpfl = {
- style : 'CategoryCost',
- provider : "Switch-EPFL",
- name:'Online Storage',
- url : [
- {name:'Switch Website',url:'https://drive.switch.ch/'}
+ Style : 'CategoryCost',
+ Provider : "Switch-EPFL",
+ Name:'Online Storage',
+ Url : [
+ {Name:'Switch Website',Url:'https://drive.switch.ch/'}
],
CatName:'Options',
Cat:{
'Cloud Based max 50GB':0,
},
CatUnit:'CHF',
};
const GoogleDriveEdu = {
- style : 'CategoryCost',
- provider : "Google Drive Educ",
- name:'Online Storage',
- url : [
- {name :'Google Education Page',url:'https://edu.google.com/?modal_active=none'}
+ Style : 'CategoryCost',
+ Provider : "Google Drive Educ",
+ Name:'Online Storage',
+ Url : [
+ {Name :'Google Education Page',Url:'https://edu.google.com/?modal_active=none'}
],
CatName:'Options',
Cat:{
'Cloud Based illimited':0,
},
CatUnit:'CHF',
};
// ELN
const SLIMSEpfl = {
- style:'CategoryAmountRatesCost',
- provider : "EPFL-LSIS",
- name:'SLIMS',
- url : [
- {name:'SLIMS on LSIS Website',url:'https://lsis.epfl.ch/page-140284-en.html'},
- {name:'SLIMS Cost on LSIS Website',url:'https://lsis.epfl.ch/cms/site/lsis/lang/en/lims'},
- {name: 'Genohm (SLIMS Company)',url:'https://www.genohm.com/'}
+ Style:'CategoryAmountRatesCost',
+ Provider : "EPFL-LSIS",
+ Name:'SLIMS',
+ Url : [
+ {Name:'SLIMS on LSIS Website',Url:'https://lsis.epfl.ch/page-140284-en.html'},
+ {Name:'SLIMS Cost on LSIS Website',Url:'https://lsis.epfl.ch/cms/site/lsis/lang/en/lims'},
+ {Name: 'Genohm (SLIMS Company)',Url:'https://www.genohm.com/'}
],
CatName:'PI Status',
Cat:{
'Full Professor':3000,
'Associate Professor':2000,
'Tenure Track Assistant Professor or Core Facility':1000
},
CatUnit:'CHF',
AmountName: "Storage",
AmountUnit: "TB",
AmountMin : 1,
AmountMax : 100,
AmountStep : 1,
AmountFree:0,
AmountFreeCumulative:false,
RateVar : true,
RateName: 'ELN Storage',
Rates : {
'Stored on EPFL Server': 300,
},
RateUnit : "CHF / TB"
};
// Database
const MysqlEpfl = {
- style : 'CategoryCost',
- provider : "EPFL-VPSI",
- name:'MySql',
- url : [
- {name:'EPFL VPSI ',url:'https://support.epfl.ch/epfl?id=epfl_service_status&service=eb026fa0db34c700ef64731b8c96198e'}
+ Style : 'CategoryCost',
+ Provider : "EPFL-VPSI",
+ Name:'MySql',
+ Url : [
+ {Name:'EPFL VPSI ',Url:'https://support.epfl.ch/epfl?id=epfl_service_status&service=eb026fa0db34c700ef64731b8c96198e'}
],
CatName:'Options',
Cat:{
'MySQL max 2GB':0,
},
CatUnit:'CHF',
};
// Repository
const Zenodo = {
- style : 'CategoryCost',
- provider : "Zenodo-CERN",
- name:'Zenodo',
- url : [
- {name:'Zenodo Website',url:'https://www.zenodo.org/'},
- {name:'About Zenodo',url:'http://about.zenodo.org/'},
+ Style : 'CategoryCost',
+ Provider : "Zenodo-CERN",
+ Name:'Zenodo',
+ Url : [
+ {Name:'Zenodo Website',Url:'https://www.zenodo.org/'},
+ {Name:'About Zenodo',Url:'http://about.zenodo.org/'},
],
CatName:'Options',
Cat:{
- 'Max 50GB per dataset':0,
+ 'Max 50GB per Dataset':0,
},
CatUnit:'CHF',
};
const C4science = {
- style : 'CategoryCost',
- provider : "EPFL-SCITAS",
- name:'C4Science',
- url : [
- {name:'C4Science Website',url:'https://www.c4science.ch/'}
+ Style : 'CategoryCost',
+ Provider : "EPFL-SCITAS",
+ Name:'C4Science',
+ Url : [
+ {Name:'C4Science Website',Url:'https://www.c4science.ch/'}
],
CatName:'Options',
Cat:{
'Free for text file':0,
},
CatUnit:'CHF',
};
const Github = {
- style: "AmountRatesCost",
- provider : "GitHub",
- name:'GitHub',
- url : [
- {name:'Github Website Pricing',url:'https://github.com/pricing'}
+ Style: "AmountRatesCost",
+ Provider : "GitHub",
+ Name:'GitHub',
+ Url : [
+ {Name:'Github Website Pricing',Url:'https://github.com/pricing'}
],
AmountName: "Number of user",
AmountUnit: "User(s)",
AmountMin : 1,
AmountMax : 100,
AmountStep : 1,
AmountFree:0,
AmountFreeCumulative:false,
RateVar : true,
RateName:'Plan',
Rates:{
'OpenSource project':0,
'Developer (for one user)':81.6,
'Team (min 5 users)':104.9,
'Business Cloud':244.7
},
RateUnit:'CHF / Users',
};
const Bitbucket= {
- style: "AmountRatesCost",
- provider : "Bitbucket",
- name:'BitBucket',
- url : [
- {name:'Bitbucket Website Pricing',url:'https://bitbucket.org/product/pricing'}
+ Style: "AmountRatesCost",
+ Provider : "Bitbucket",
+ Name:'BitBucket',
+ Url : [
+ {Name:'Bitbucket Website Pricing',Url:'https://bitbucket.org/product/pricing'}
],
AmountName: "Number of user",
AmountUnit: "User(s)",
AmountMin : 1,
AmountMax : 100,
AmountStep : 1,
AmountFree:0,
AmountFreeCumulative:false,
RateVar : true,
RateName:'Plan',
Rates:{
'Free (up to 5 users)':0,
'Standard for growing teams (min 5 users)':24,
'Premium for large teams (min 5 users)':60,
},
RateUnit:'CHF / Users',
};
const Gitlab= {
- style: "AmountRatesCost",
- provider : "Gitlab",
- name:'Gitlab',
- url : [
- {name:'Gitlab Website Pricing',url:'https://about.gitlab.com/pricing/'}
+ Style: "AmountRatesCost",
+ Provider : "Gitlab",
+ Name:'Gitlab',
+ Url : [
+ {Name:'Gitlab Website Pricing',Url:'https://about.gitlab.com/pricing/'}
],
AmountName: "Number of user",
AmountUnit: "User(s)",
AmountMin : 1,
AmountMax : 100,
AmountStep : 1,
AmountFree:0,
AmountFreeCumulative:false,
RateVar : true,
RateName:'Plan',
Rates:{
'Core Self Hosted':0,
'Free Cloud Based' : 0,
'Starter Self Hosted':48,
'Bronze Cloud based':48,
'Premium Self Hosted':228,
'Silver Cloud Based':228
},
RateUnit:'CHF / Users',
};
const Figshare = {
- style : 'CategoryCost',
- provider : "FigShare",
- name:'Figshare',
- url : [
- {name:'Figshare website',url:'https://figshare.com/'},
- {name:'Figshare Pricing',url:'https://www.g2crowd.com/products/figshare/pricing'}
+ Style : 'CategoryCost',
+ Provider : "FigShare",
+ Name:'Figshare',
+ Url : [
+ {Name:'Figshare website',Url:'https://figshare.com/'},
+ {Name:'Figshare Pricing',Url:'https://www.g2crowd.com/products/figshare/pricing'}
],
CatName:'Options',
Cat:{
'Free 1GB':0,
'10GB':96,
'15GB':132,
'20GB':180
},
CatUnit:'CHF',
};
const Dryad = {
- style : 'CategoryAmountRatesCost',
- provider : "Dryad",
- name:'Dyrad',
- url : [
- {name:'Dryad Website Pricing',url:'https://datadryad.org/pages/payment'}
+ Style : 'CategoryAmountRatesCost',
+ Provider : "Dryad",
+ Name:'Dyrad',
+ Url : [
+ {Name:'Dryad Website Pricing',Url:'https://Datadryad.org/pages/payment'}
],
CatName:'Options',
Cat:{
'up to 20GB if DPC covered':0,
'up to 20GB if no DPC covered':120
},
CatUnit:'CHF',
AmountName: "Extra - Storage",
AmountUnit: "GB",
AmountMin : 0,
AmountMax : 100,
AmountStep : 10,
AmountFree:0,
AmountFreeCumulative:false,
RateVar : true,
RateName: 'ELN Storage',
Rates : {
'Extra Storage': 50,
},
RateUnit : "CHF / GB"
};
// Categories definition
// ----------------------------------------------------
// ----------------------------------------------------
const NoneSelected={
- style: 'NoneSelect',
- provider:'None',
- name:'Select a Provider',
- url:'',
+ Style: 'NoneSelect',
+ Provider:'None',
+ Name:'Select a Provider',
+ Url:'',
};
const storage={
- name : 'Active Storage',
- icon : 'storage.png',
- url : [
- {name:'EPFL RDM',url:'https://researchdata.epfl.ch/work-with-data/storage/'}
+ Name : 'Active Storage',
+ Icon : 'storage.png',
+ Url : [
+ {Name:'EPFL RDM',Url:'https://researchData.epfl.ch/work-with-Data/storage/'}
],
- intro :'',
- data :[NoneSelected,
+ Intro :'',
+ Data :[NoneSelected,
NasEpfl,
SwitchEpfl,
GoogleDriveEdu
]
};
const ELN={
- name : 'Electronic LabBook',
- icon : 'eln.png',
- url : [
- {name: 'EPFL RDM',url:'https://researchdata.epfl.ch/work-with-data/active-data-management/'}
+ Name : 'Electronic LabBook',
+ Icon : 'eln.png',
+ Url : [
+ {Name: 'EPFL RDM',Url:'https://researchData.epfl.ch/work-with-Data/active-Data-management/'}
],
- intro :'',
- data :[NoneSelected,
+ Intro :'',
+ Data :[NoneSelected,
SLIMSEpfl,
]
};
-const database={
- name : 'Database',
- icon : 'database.png',
- url : '',
- intro :'',
- data :[NoneSelected,
+const Database={
+ Name : 'Database',
+ Icon : 'Database.png',
+ Url : '',
+ Intro :'',
+ Data :[NoneSelected,
MysqlEpfl,
]
};
const repository={
- name : 'Repository',
- icon : 'repos.png',
- url : [
- {name:'EPFL RDM WebPage',url:'https://researchdata.epfl.ch/publish-preserve/'}
+ Name : 'Repository',
+ Icon : 'repos.png',
+ Url : [
+ {Name:'EPFL RDM WebPage',Url:'https://researchData.epfl.ch/publish-preserve/'}
],
- intro :'',
- data :[
+ Intro :'',
+ Data :[
NoneSelected,
Zenodo,
C4science,
Github,
Bitbucket,
Gitlab,
Figshare,
Dryad,
]
};
// Combine Categories
// ----------------------------------------------------
// ----------------------------------------------------
-const maincat={
- data:[storage,ELN,database,repository]
+const MainData={
+ Currency:'CHF',
+ Data:[storage,ELN,Database,repository]
};