From be55ed3ee405f40be0e979f45f42ebd403d3f1e4 Mon Sep 17 00:00:00 2001
From: Raam Chauhan <Raam.Chauhan@softwire.com>
Date: Thu, 9 Nov 2017 15:45:03 +0000
Subject: [PATCH] Updated absolute filepaths to relate filepaths

---
 .idea/workspace.xml | 83 ++++++++++++++++++++++++++++++++++-----------
 createAccounts.js   | 35 +++++++++++++++++++
 index.js            | 49 +++++---------------------
 3 files changed, 108 insertions(+), 59 deletions(-)
 create mode 100644 createAccounts.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 237a094..610cce9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="39ebc23b-c248-41a9-9993-3091849bbe12" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/createAccounts.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
     </list>
@@ -17,8 +18,38 @@
       <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1516">
-              <caret line="139" column="0" lean-forward="true" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
+            <state relative-caret-position="153">
+              <caret line="9" column="48" lean-forward="false" selection-start-line="9" selection-start-column="48" selection-end-line="9" selection-end-column="48" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="transactionClass.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/transactionClass.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="204">
+              <caret line="12" column="20" lean-forward="false" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="accountClass.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/accountClass.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="5" column="1" lean-forward="false" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="createAccounts.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/createAccounts.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
               <folding />
             </state>
           </provider>
@@ -43,6 +74,11 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>accountex</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -58,9 +94,10 @@
         <option value="$PROJECT_DIR$/accountClass.js" />
         <option value="$PROJECT_DIR$/currencyFormatter.js" />
         <option value="$PROJECT_DIR$/transactionClass.js" />
-        <option value="$PROJECT_DIR$/accountExistsQ.js" />
         <option value="$PROJECT_DIR$/parseTransactions.js" />
+        <option value="$PROJECT_DIR$/accountExistsQ.js" />
         <option value="$PROJECT_DIR$/index.js" />
+        <option value="$PROJECT_DIR$/createAccounts.js" />
       </list>
     </option>
   </component>
@@ -236,12 +273,12 @@
       <option name="presentableId" value="Default" />
       <updated>1510136343530</updated>
       <workItem from="1510136344780" duration="22141000" />
-      <workItem from="1510219280573" duration="13917000" />
+      <workItem from="1510219280573" duration="15595000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36058000" />
+    <option name="totallyTimeSpent" value="37736000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="1132" height="1167" extended-state="0" />
@@ -321,26 +358,26 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/employee.js" />
     <entry file="file://$PROJECT_DIR$/currencyFormatter.js" />
-    <entry file="file://$PROJECT_DIR$/transactionClass.js">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="29" />
+        <state relative-caret-position="289">
+          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/accountClass.js">
+    <entry file="file://$PROJECT_DIR$/parseTransactions.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="1" lean-forward="false" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
+        <state relative-caret-position="68">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/accountClass.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="85">
+          <caret line="5" column="1" lean-forward="false" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
           <folding />
         </state>
       </provider>
@@ -353,18 +390,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parseTransactions.js">
+    <entry file="file://$PROJECT_DIR$/createAccounts.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+        <state relative-caret-position="17">
+          <caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/transactionClass.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="20" lean-forward="false" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1516">
-          <caret line="139" column="0" lean-forward="true" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
+        <state relative-caret-position="153">
+          <caret line="9" column="48" lean-forward="false" selection-start-line="9" selection-start-column="48" selection-end-line="9" selection-end-column="48" />
           <folding />
         </state>
       </provider>
diff --git a/createAccounts.js b/createAccounts.js
new file mode 100644
index 0000000..a12a07b
--- /dev/null
+++ b/createAccounts.js
@@ -0,0 +1,35 @@
+const Account = require('./accountClass');
+const accountExistsQ = require('./accountExistsQ');
+
+function createAccounts()
+{
+    for(let i in transactions)
+    {
+        if(!accountExistsQ(transactions[i].from))
+        {
+            //if the account does not exist,create the account
+            senderAccount = new Account(transactions[i].from,0);
+            accounts.push(senderAccount);
+        }
+        else
+        {
+            senderAccount = accounts.find(account => account.name === transactions[i].from);
+        }
+
+        if(!accountExistsQ(transactions[i].to))
+        {
+            //if the account does not exist,create the account
+            receiverAccount = new Account(transactions[i].to,0);
+            accounts.push(receiverAccount);
+        }
+        else
+        {
+            receiverAccount = accounts.find(account => account.name === transactions[i].to);
+        }
+
+        senderAccount.amount = senderAccount.amount - transactions[i].amount;
+        receiverAccount.amount = receiverAccount.amount + transactions[i].amount;
+    }
+}
+
+module.exports = createAccounts;
\ No newline at end of file
diff --git a/index.js b/index.js
index 10e1f3f..667d30e 100644
--- a/index.js
+++ b/index.js
@@ -4,10 +4,10 @@ const readlineSync = require('readline-sync');
 const log4js = require('log4js');
 const moment = require('moment');
 
-const Transaction = require('C:\\Work\\Training\\SupportBank\\transactionClass.js');
-const Account = require('C:\\Work\\Training\\SupportBank\\accountClass.js');
+const Transaction = require('./transactionClass');
 
-const accountExistsQ = require('C:\\Work\\Training\\SupportBank\\accountExistsQ.js');
+const accountExistsQ = require('./accountExistsQ');
+const createAccounts = require('./createAccounts');
 
 const formatter = new Intl.NumberFormat('en-UK', {
     style: 'currency',
@@ -55,36 +55,7 @@ function parseTransactions(){
         " transactions");
 }
 
-function createAccounts()
-{
-    for(let i in transactions)
-    {
-        if(!accountExistsQ(transactions[i].from))
-        {
-            //if the account does not exist,create the account
-            senderAccount = new Account(transactions[i].from,0);
-            accounts.push(senderAccount);
-        }
-        else
-        {
-            senderAccount = accounts.find(account => account.name === transactions[i].from);
-        }
 
-        if(!accountExistsQ(transactions[i].to))
-        {
-            //if the account does not exist,create the account
-            receiverAccount = new Account(transactions[i].to,0);
-            accounts.push(receiverAccount);
-        }
-        else
-        {
-            receiverAccount = accounts.find(account => account.name === transactions[i].to);
-        }
-
-        senderAccount.amount = senderAccount.amount - transactions[i].amount;
-        receiverAccount.amount = receiverAccount.amount + transactions[i].amount;
-    }
-}
 
 function importFile(fileName) {
     var ext = fileName.split('.').pop();
@@ -93,6 +64,11 @@ function importFile(fileName) {
         try {
             const inputArray = fs.readFileSync(dataFile).toString();
             const records = parse(inputArray, {columns: true});
+            // return records.map(function(record) {
+            //
+            //     return new Transaction(record.date);
+            // });
+
             return records;
         }
 
@@ -131,7 +107,7 @@ records = importFile(dataFile);
 
 
 
-const logger = log4js.getLogger(dataFile);
+const logger = log4js.getLogger('index.js');
 logger.debug("Program starting up...")
 
 
@@ -141,13 +117,6 @@ parseTransactions();
 accounts = [];
 createAccounts();
 
-
-
-
-
-
-
-
 const userInput = readlineSync.question('Please enter "List All" or "List [Account]" : ');
 const pattern = new RegExp("List ");