finished prep exercices

ImAltay · ImAltay · commit 38817cd69f34 · 2024-02-17T14:09:29.000+01:00
diff --git a/Week4/prep-exercises/1-wallet/ex1-closure-example.js b/Week4/prep-exercises/1-wallet/ex1-closure-example.js
@@ -1,3 +1,4 @@
+"use strict";
 import eurosFormatter from "./euroFormatter.js";
 
 /**
diff --git a/Week4/prep-exercises/1-wallet/ex2-classes.js b/Week4/prep-exercises/1-wallet/ex2-classes.js
@@ -1,10 +1,11 @@
+"use strict";
 import eurosFormatter from "./euroFormatter.js";
 
 class Wallet {
   #name;
   #cash;
-  dailyAllowance = 40;
-  dayTotalWithdrawals = 0;
+  #dailyAllowance = 40;
+  #dayTotalWithdrawals = 0;
 
   constructor(name, cash) {
     this.#name = name;
@@ -25,13 +26,13 @@ class Wallet {
       return 0;
     }
 
-    if (this.dayTotalWithdrawals + amount > this.dailyAllowance) {
+    if (this.#dayTotalWithdrawals + amount > this.#dailyAllowance) {
       console.log(`Insufficient remaining daily allowance!`);
       return 0;
     }
 
     this.#cash -= amount;
-    this.dayTotalWithdrawals += amount;
+    this.#dayTotalWithdrawals += amount;
     return amount;
   }
 
@@ -45,14 +46,14 @@ class Wallet {
     wallet.deposit(withdrawnAmount);
   }
   setDailyAllowance(newAllowance) {
-    this.dailyAllowance = newAllowance;
+    this.#dailyAllowance = newAllowance;
     console.log(
       `Daily allowance set to: ${eurosFormatter.format(newAllowance)}`
     );
   }
 
   resetDailyAllowance() {
-    this.dayTotalWithdrawals = 0;
+    this.#dayTotalWithdrawals = 0;
   }
 
   reportBalance() {
@@ -64,6 +65,7 @@ class Wallet {
 
 function main() {
   const walletJack = new Wallet("Jack", 100);
+  console.log(typeof walletJack);
   const walletJoe = new Wallet("Joe", 10);
   const walletJane = new Wallet("Jane", 20);
 
diff --git a/Week4/prep-exercises/1-wallet/ex3-object.js b/Week4/prep-exercises/1-wallet/ex3-object.js
@@ -1,11 +1,12 @@
+"use strict";
 import eurosFormatter from "./euroFormatter.js";
 
 function createWallet(name, cash = 0) {
   return {
     _name: name,
     _cash: cash,
-    dailyAllowance: 40,
-    dayTotalWithdrawals: 0,
+    _dailyAllowance: 40,
+    _dayTotalWithdrawals: 0,
 
     deposit: function (amount) {
       this._cash += amount;
@@ -16,7 +17,7 @@ function createWallet(name, cash = 0) {
         console.log(`Insufficient funds!`);
         return 0;
       }
-      if (this.dayTotalWithdrawals + amount > this.dailyAllowance) {
+      if (this._dayTotalWithdrawals + amount > this._dailyAllowance) {
         console.log(`Insufficient remaining daily allowance!`);
         return 0;
       }
@@ -36,14 +37,14 @@ function createWallet(name, cash = 0) {
     },
 
     setDailyAllowance: function (newAllowance) {
-      this.dailyAllowance = newAllowance;
+      this._dailyAllowance = newAllowance;
       console.log(
         `Daily allowance set to: ${eurosFormatter.format(newAllowance)}`
       );
     },
 
     resetDailyAllowance: function () {
-      this.dayTotalWithdrawals = 0;
+      this._dayTotalWithdrawals = 0;
     },
 
     reportBalance: function () {
diff --git a/Week4/prep-exercises/1-wallet/ex4-object-shared-methods.js b/Week4/prep-exercises/1-wallet/ex4-object-shared-methods.js
@@ -1,4 +1,5 @@
-import eurosFormatter from './euroFormatter.js';
+"use strict";
+import eurosFormatter from "./euroFormatter.js";
 
 function deposit(amount) {
   this._cash += amount;
@@ -9,8 +10,13 @@ function withdraw(amount) {
     console.log(`Insufficient funds!`);
     return 0;
   }
+  if (this._dayTotalWithdrawals + amount > this._dailyAllowance) {
+    console.log(`Insufficient remaining daily allowance!`);
+    return 0;
+  }
 
   this._cash -= amount;
+  this._dayTotalWithdrawals += amount;
   return amount;
 }
 
@@ -34,10 +40,22 @@ function getName() {
   return this._name;
 }
 
+function resetDailyAllowance() {
+  this._dayTotalWithdrawals = 0;
+}
+
+function setDailyAllowance(amount) {
+  this._dailyAllowance = amount;
+}
+
 function createWallet(name, cash = 0) {
   return {
     _name: name,
     _cash: cash,
+    _dailyAllowance: 40,
+    _dayTotalWithdrawals: 0,
+    resetDailyAllowance,
+    setDailyAllowance,
     deposit,
     withdraw,
     transferInto,
@@ -47,11 +65,14 @@ function createWallet(name, cash = 0) {
 }
 
 function main() {
-  const walletJack = createWallet('Jack', 100);
-  const walletJoe = createWallet('Joe', 10);
-  const walletJane = createWallet('Jane', 20);
+  const walletJack = createWallet("Jack", 100);
+  const walletJoe = createWallet("Joe", 10);
+  const walletJane = createWallet("Jane", 20);
 
   walletJack.transferInto(walletJoe, 50);
+  walletJack.setDailyAllowance(80);
+  walletJack.transferInto(walletJoe, 50);
+
   walletJane.transferInto(walletJoe, 25);
 
   walletJane.deposit(20);
diff --git a/Week4/prep-exercises/1-wallet/ex5-prototype.js b/Week4/prep-exercises/1-wallet/ex5-prototype.js
@@ -1,8 +1,11 @@
-import eurosFormatter from './euroFormatter.js';
+"use strict";
+import eurosFormatter from "./euroFormatter.js";
 
 function Wallet(name, cash) {
   this._name = name;
   this._cash = cash;
+  this._dailyAllowance = 40;
+  this._dayTotalWithdrawals = 0;
 }
 
 Wallet.prototype.deposit = function (amount) {
@@ -14,8 +17,13 @@ Wallet.prototype.withdraw = function (amount) {
     console.log(`Insufficient funds!`);
     return 0;
   }
+  if (this._dayTotalWithdrawals + amount > this._dailyAllowance) {
+    console.log(`Insufficient remaining daily allowance!`);
+    return 0;
+  }
 
   this._cash -= amount;
+  this._dayTotalWithdrawals += amount;
   return amount;
 };
 
@@ -29,6 +37,14 @@ Wallet.prototype.transferInto = function (wallet, amount) {
   wallet.deposit(withdrawnAmount);
 };
 
+Wallet.prototype.setDailyAllowance = function (amount) {
+  this._dailyAllowance = amount;
+};
+
+Wallet.prototype.resetDailyWithdrawals = function () {
+  this._dayTotalWithdrawals = 0;
+};
+
 Wallet.prototype.reportBalance = function () {
   console.log(
     `Name: ${this._name}, balance: ${eurosFormatter.format(this._cash)}`
@@ -40,11 +56,14 @@ Wallet.prototype.getName = function () {
 };
 
 function main() {
-  const walletJack = new Wallet('Jack', 100);
-  const walletJoe = new Wallet('Joe', 10);
-  const walletJane = new Wallet('Jane', 20);
+  const walletJack = new Wallet("Jack", 100);
+  const walletJoe = new Wallet("Joe", 10);
+  const walletJane = new Wallet("Jane", 20);
 
   walletJack.transferInto(walletJoe, 50);
+  walletJack.setDailyAllowance(80);
+  walletJack.transferInto(walletJoe, 50);
+
   walletJane.transferInto(walletJoe, 25);
 
   walletJane.deposit(20);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+"use strict";`
`1`	`2`	`import eurosFormatter from "./euroFormatter.js";`
`2`	`3`
`3`	`4`	`/**`