demo code changed

avichaig · avichaig · commit db38ce9e3727 · 2018-01-30T14:25:15.000+02:00
getPersonAboveAge function added
printArray functiojn added
init function no longer update dom, colling those function insted
diff --git a/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/HtmlBasic.csproj b/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/HtmlBasic.csproj
@@ -94,13 +94,13 @@
     <Content Include="Content\Site.css" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
+    <Content Include="index.html" />
     <Content Include="Scripts\indexScript.js" />
     <Content Include="Scripts\modernizr-2.6.2.js" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\RouteConfig.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -124,6 +124,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Controllers\" />
     <Folder Include="Models\" />
   </ItemGroup>
   <PropertyGroup>
diff --git a/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/Scripts/indexScript.js b/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/Scripts/indexScript.js
@@ -26,33 +26,33 @@
             age: 25,
             email: 'william@example.com'
         }]
+    const age = 20;
 
-    let personAboveAge = [];
 
-    let personListString = '';
-    let personAboveListString = '';
+    console.log('persons List')
+    printArray(personsLst);
 
-    for (let person of personsLst) {
-        personListString += `<li>${person.name} (${person.age}) <br />${person.email}</li>`;
-    }
+    const personAboveAge = getPersonsAboveAge(personsLst, age);
+    console.log(`persons Above ${age} List`)
+    printArray(personAboveAge);
+}
+
+init();
+
+function getPersonsAboveAge(array, age) {
+    const personAboveAge = [];
 
-    for (let person of personsLst) {
+    for (let person of array) {
 
-        if (person.age >= 20) {
+        if (person.age >= age) {
             personAboveAge.push(person);
         }
     }
+    return personAboveAge;
+}
 
-    for (let i = 0; i < personAboveAge.length; i++) {
-        personAboveListString += `<li>${personAboveAge[i].name} (${personAboveAge[i].age}) <br />${personAboveAge[i].email}</li>`;
+function printArray(array) {
+    for (let i = 0; i < array.length; i++) {
+        console.log(`${array[i].name} (${array[i].age}) ${array[i].email}`);
     }
-
-
-    const personOl = document.getElementById('personList');
-    personOl.innerHTML = personListString;
-    const personAbove = document.getElementById('personAboveList');
-    personAbove.innerHTML = personAboveListString;
 }
-
-init();
-
diff --git a/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/Views/Home/Index.html b/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/Views/Home/Index.html
@@ -1,7 +1,4 @@
 ﻿<h3>All persons</h3>
 <ol id="personList"></ol>
 
-<h3>Persons of age 20 and above</h3>
-<ol id="personAboveList"></ol>
-
 <script src="~/Scripts/indexScript.js"></script>
diff --git a/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/index.html b/Allfiles/Mod03/Democode/Lesson01/HtmlBasic/HtmlBasic/index.html
@@ -0,0 +1,33 @@
+﻿<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>HTML Basic</title>
+    <link href="/Content/Site.css" rel="stylesheet" type="text/css" />
+    <link href="/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <script src="/Scripts/modernizr-2.6.2.js"></script>
+    <script src="/Scripts/indexScript.js"></script>
+</head>
+<body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+
+            </div>
+            <div class="navbar-collapse collapse">
+                <ul class="nav navbar-nav"></ul>
+            </div>
+        </div>
+    </div>
+
+    <div class="container body-content">
+        
+    </div>
+</body>
+</html>
