From 72f74befde634b7b4e1c4a2a2b944c59abedb523 Mon Sep 17 00:00:00 2001
From: James Myers <jamesmyers@jamess-mbp.attlocal.net>
Date: Thu, 2 Aug 2018 10:41:38 -0400
Subject: [PATCH 1/2] 	modified:  
 configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
 	modified:  
 configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
 	modified:   configurationapp/src/main/resources/static/index.html 
 modified:   configurationapp/src/main/resources/static/js/app.js

---
 .../dao/configurations/ConfigurationDao.java  | 19 ++++-
 .../ConfigurationController.java              | 13 ++--
 .../src/main/resources/static/index.html      | 11 ++-
 .../src/main/resources/static/js/app.js       | 72 ++++++++++++++++++-
 4 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
index f889558..26b0e48 100644
--- a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
+++ b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
@@ -1,6 +1,8 @@
 package com.att.dao.configurations;
 
 import com.att.data.configurations.ConfigValue;
+//import java.awt.List;
+import javax.print.attribute.HashAttributeSet;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -34,15 +36,26 @@ public ConfigurationDao() {
     }
 
     public List<ConfigValue> getConfigurationsForYearMonth(String yearMonth) {
-        return new ArrayList<>();
+        List<ConfigValue> list = new ArrayList<ConfigValue>();
+        
+        if(currentConfigurations.containsKey(yearMonth))
+            {
+                return currentConfigurations.get(yearMonth);
+            }
+            return new ArrayList<>();
     }
 
     public void addConfiguration(String yearMonth, ConfigValue value) {
         int newId = idProvider.getNextId();
-
+        ConfigValue newConfig = new ConfigValue();
+        newConfig.setConfigId(newId);
+        newConfig.setConfigName(value.getConfigName());
+        List<ConfigValue> list = new ArrayList<ConfigValue>();
+        list.add(value);
+        currentConfigurations.put(yearMonth,list);
     }
 
     public void removeAllConfigurationsForYearMonth(String yearMonth) {
-
+        currentConfigurations.remove(yearMonth); 
     }
 }
diff --git a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
index 995402a..57a490f 100644
--- a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
+++ b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
@@ -2,6 +2,7 @@
 
 import com.att.dao.configurations.ConfigurationDao;
 import com.att.data.configurations.ConfigValue;
+import java.io.Console;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,18 +20,20 @@ public ConfigurationController(ConfigurationDao dao) {
         this.dao = dao;
     }
 
-    @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.GET)
+    @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.GET, produces="application/json")
     @ResponseBody
     public List<ConfigValue> getConfigurationsForYearMonth(
             @PathVariable("yearMonthNumber") String yearMonth) {
 
-        return new ArrayList<>();
+            List<ConfigValue> getConfigValue = dao.getConfigurationsForYearMonth(yearMonth); 
+
+        return getConfigValue;
     }
 
     @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.DELETE)
     public void deleteConfigurationsForYearMonth(@PathVariable("yearMonthNumber") String yearMonth) {
         try {
-
+            dao.removeAllConfigurationsForYearMonth(yearMonth);
         } catch (Exception ex) {
 
         }
@@ -39,7 +42,7 @@ public void deleteConfigurationsForYearMonth(@PathVariable("yearMonthNumber") St
     @RequestMapping(value="/{yearMonthNumber}", method={ RequestMethod.POST, RequestMethod.PUT })
     public void addConfigurationForYearMonth(
             @PathVariable("yearMonthNumber") String yearMonth,
-            @RequestBody ConfigValue value) {
-
+            @RequestBody ConfigValue configValueIn) {
+                dao.addConfiguration(yearMonth, configValueIn);        
     }
 }
diff --git a/configurationapp/src/main/resources/static/index.html b/configurationapp/src/main/resources/static/index.html
index 7cd14ba..257a392 100644
--- a/configurationapp/src/main/resources/static/index.html
+++ b/configurationapp/src/main/resources/static/index.html
@@ -2,7 +2,8 @@
 <html>
 <head>
     <title>Configuration App</title>
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>>
+    <!-- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script> -->
     <script src="https://cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
     <script src="js/app.js"></script>
     <link rel="stylesheet" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css" />
@@ -33,9 +34,15 @@ <h1>Welcome To The Configuration App</h1>
 
                 </tbody>
             </table>
-        </div>
+        </div> 
         <div class="controls">
             <button id="saveButton">Save Configurations</button>
+            <button id="deleteButton">Delete Configurations</button>
+        </div>
+        <div class="controls">
+            <button id="newButton">New Configurations</button>
+            <input id="configId" placeholder="Config ID" type="text" />
+            <input id="configName" placeholder="Config Name" type="text" />
         </div>
     </div>
     <script>
diff --git a/configurationapp/src/main/resources/static/js/app.js b/configurationapp/src/main/resources/static/js/app.js
index 2d4b945..55c377f 100644
--- a/configurationapp/src/main/resources/static/js/app.js
+++ b/configurationapp/src/main/resources/static/js/app.js
@@ -1,13 +1,79 @@
 (function() {
-    function App() {
 
+    window.onload = function() {
+
+        $('#timePeriod').change(function(){
+            var yearMonth = document.getElementById("timePeriod").value;
+            app.getData(yearMonth);
+        });
+
+        document.getElementById('newButton').onclick = function() {
+            var yearMonth = document.getElementById("timePeriod").value;
+            var configId = document.getElementById("configId").value;
+            document.getElementById("configId").value = ""
+            var configName = document.getElementById("configName").value;
+            document.getElementById("configName").value= "";
+             app.putData(yearMonth, configId, configName);                      
+        };
+
+        document.getElementById('deleteButton').onclick = function() {
+            var yearMonth = document.getElementById("timePeriod").value;
+             app.deleteData(yearMonth);                      
+        };
+    }
+
+    function App() {
     }
 
-    App.prototype.getData = function() {
-        $.ajax('',{
+    App.prototype.putData = function(yearMonth, configId, configName) {
+        var dTable = $('#configTable').DataTable();
+        var value = [ configName, configId ];
+        var valueJson = JSON.stringify({configValueIn: value});
+        dTable.clear().draw();
+        $.ajax({
+            contentType: "application/json; charset=utf-8",
+            type: "POST",
+            url: "/configuration/addConfigurationForYearMonth/"+yearMonth,
+            data: valueJson
+        }).then(function(data) {
+            dTable.row.add([
+                configId,
+                configName
+            ]).draw();
+        })
+    };
 
+    App.prototype.deletetData = function(yearMonth) {
+        var dTable = $('#configTable').DataTable();
+        dTable.clear().draw();
+        $.ajax({
+            type: "DELETE",
+            url: "/configuration/deleteConfigurationsForYearMonth/"+yearMonth
         }).then(function(data) {
+            console.log("data: "+data);
+            $.each(data, function( index, configValue ) {
+                dTable.row.add([
+                    configValue.configId,
+                    configValue.configName
+                ]).draw();
+            });
+        })
+    };
 
+    App.prototype.getData = function(yearMonth) {
+        var dTable = $('#configTable').DataTable();
+        dTable.clear().draw();
+        $.ajax({
+            type: "GET",
+            url: "/configuration/getConfigurationsForYearMonth/"+yearMonth
+        }).then(function(data) {
+            console.log("data: "+data);
+            $.each(data, function( index, configValue ) {
+                dTable.row.add([
+                    configValue.configId,
+                    configValue.configName
+                ]).draw();
+            });
         })
     };
 

From fa619e8677fd885e18cd4dc7ba6dca39f638ab8d Mon Sep 17 00:00:00 2001
From: James Myers <jamesmyers@jamess-mbp.attlocal.net>
Date: Fri, 3 Aug 2018 00:53:15 -0400
Subject: [PATCH 2/2] 	modified:  
 configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
 	modified:  
 configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
 	modified:   configurationapp/src/main/resources/static/index.html 
 modified:   configurationapp/src/main/resources/static/js/app.js

---
 .../dao/configurations/ConfigurationDao.java  | 39 +++++++--
 .../ConfigurationController.java              | 35 ++++----
 .../src/main/resources/static/index.html      |  2 +-
 .../src/main/resources/static/js/app.js       | 79 ++++++++++++-------
 4 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
index 26b0e48..1c7f470 100644
--- a/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
+++ b/configurationapp/src/main/java/com/att/dao/configurations/ConfigurationDao.java
@@ -2,6 +2,7 @@
 
 import com.att.data.configurations.ConfigValue;
 //import java.awt.List;
+import com.sun.org.apache.xpath.internal.operations.And;
 import javax.print.attribute.HashAttributeSet;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Iterator;
 
 @Service
 public class ConfigurationDao {
@@ -45,17 +47,44 @@ public List<ConfigValue> getConfigurationsForYearMonth(String yearMonth) {
             return new ArrayList<>();
     }
 
-    public void addConfiguration(String yearMonth, ConfigValue value) {
+    public int addConfiguration(String yearMonth, ConfigValue value) {
         int newId = idProvider.getNextId();
-        ConfigValue newConfig = new ConfigValue();
-        newConfig.setConfigId(newId);
-        newConfig.setConfigName(value.getConfigName());
+        value.setConfigId(newId);
         List<ConfigValue> list = new ArrayList<ConfigValue>();
-        list.add(value);
+        if (currentConfigurations.containsKey(yearMonth)) {
+            list = currentConfigurations.get(yearMonth);
+            list.add(value);
+        } else {      
+            list.add(value);
+        }
         currentConfigurations.put(yearMonth,list);
+        return newId;
     }
 
     public void removeAllConfigurationsForYearMonth(String yearMonth) {
         currentConfigurations.remove(yearMonth); 
     }
+
+    public void removeConfigurationsForYearMonth(String yearMonth, ConfigValue value) {
+        List<ConfigValue> list = new ArrayList<ConfigValue>();
+        if (currentConfigurations.containsKey(yearMonth)) {
+            list = currentConfigurations.get(yearMonth);
+            Iterator<ConfigValue> iterator = list.iterator();
+            List<ConfigValue> listAfter = new ArrayList<>();
+            while(iterator.hasNext()) {
+                ConfigValue next = iterator.next();
+                    if(next.getConfigId() ==  value.getConfigId() &&
+                        next.getConfigName().equals(value.getConfigName())) {
+                        
+                    } else {
+                        listAfter.add(next);
+                    }
+                }
+           
+            currentConfigurations.remove(yearMonth);
+            currentConfigurations.put(yearMonth,listAfter);
+        } 
+    }
+
+    
 }
diff --git a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
index 57a490f..087c948 100644
--- a/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
+++ b/configurationapp/src/main/java/com/att/web/configuarations/ConfigurationController.java
@@ -20,29 +20,36 @@ public ConfigurationController(ConfigurationDao dao) {
         this.dao = dao;
     }
 
-    @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.GET, produces="application/json")
-    @ResponseBody
-    public List<ConfigValue> getConfigurationsForYearMonth(
-            @PathVariable("yearMonthNumber") String yearMonth) {
+    @RequestMapping(value="/getConfigurationsForYearMonth/{yearMonth}", method=RequestMethod.GET) 
+    public  List<ConfigValue> getConfigurationsForYearMonth(
+            @PathVariable("yearMonth") String yearMonth) {
 
             List<ConfigValue> getConfigValue = dao.getConfigurationsForYearMonth(yearMonth); 
 
         return getConfigValue;
     }
-
-    @RequestMapping(value="/{yearMonthNumber}", method=RequestMethod.DELETE)
-    public void deleteConfigurationsForYearMonth(@PathVariable("yearMonthNumber") String yearMonth) {
-        try {
-            dao.removeAllConfigurationsForYearMonth(yearMonth);
-        } catch (Exception ex) {
-
+    
+    @RequestMapping(value="/deleteConfigurationsForYearMonth/{yearMonthNumber}/{deleteAll}", method=RequestMethod.DELETE)
+    public void deleteConfigurationsForYearMonth(
+        @PathVariable("deleteAll") Boolean deleteAll,
+        @PathVariable("yearMonthNumber") String yearMonth,
+        @RequestBody ConfigValue configValueIn) {
+        
+        if (deleteAll) {
+            try {
+                dao.removeAllConfigurationsForYearMonth(yearMonth);
+            } catch (Exception ex) {
+
+            }
+        } else {
+            dao.removeConfigurationsForYearMonth(yearMonth,configValueIn);
         }
     }
 
-    @RequestMapping(value="/{yearMonthNumber}", method={ RequestMethod.POST, RequestMethod.PUT })
-    public void addConfigurationForYearMonth(
+    @RequestMapping(value="/addConfigurationForYearMonth/{yearMonthNumber}", method={ RequestMethod.POST, RequestMethod.PUT })
+    public int addConfigurationForYearMonth(
             @PathVariable("yearMonthNumber") String yearMonth,
             @RequestBody ConfigValue configValueIn) {
-                dao.addConfiguration(yearMonth, configValueIn);        
+            return(dao.addConfiguration(yearMonth, configValueIn));        
     }
 }
diff --git a/configurationapp/src/main/resources/static/index.html b/configurationapp/src/main/resources/static/index.html
index 257a392..77d1c91 100644
--- a/configurationapp/src/main/resources/static/index.html
+++ b/configurationapp/src/main/resources/static/index.html
@@ -28,6 +28,7 @@ <h1>Welcome To The Configuration App</h1>
                     <tr>
                         <td>Configuration Id</td>
                         <td>Configuration Name</td>
+                        <td></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,7 +42,6 @@ <h1>Welcome To The Configuration App</h1>
         </div>
         <div class="controls">
             <button id="newButton">New Configurations</button>
-            <input id="configId" placeholder="Config ID" type="text" />
             <input id="configName" placeholder="Config Name" type="text" />
         </div>
     </div>
diff --git a/configurationapp/src/main/resources/static/js/app.js b/configurationapp/src/main/resources/static/js/app.js
index 55c377f..2661de0 100644
--- a/configurationapp/src/main/resources/static/js/app.js
+++ b/configurationapp/src/main/resources/static/js/app.js
@@ -9,54 +9,61 @@
 
         document.getElementById('newButton').onclick = function() {
             var yearMonth = document.getElementById("timePeriod").value;
-            var configId = document.getElementById("configId").value;
-            document.getElementById("configId").value = ""
             var configName = document.getElementById("configName").value;
             document.getElementById("configName").value= "";
-             app.putData(yearMonth, configId, configName);                      
+             app.putData(yearMonth, configName);                      
         };
 
         document.getElementById('deleteButton').onclick = function() {
             var yearMonth = document.getElementById("timePeriod").value;
-             app.deleteData(yearMonth);                      
+             app.deleteData(true, yearMonth, null, null);                      
         };
     }
 
     function App() {
     }
 
-    App.prototype.putData = function(yearMonth, configId, configName) {
+    App.prototype.putData = function(yearMonth, configName) {
         var dTable = $('#configTable').DataTable();
-        var value = [ configName, configId ];
-        var valueJson = JSON.stringify({configValueIn: value});
-        dTable.clear().draw();
+        var JSONObject= {
+            'configId': 0,
+            'configName': configName
+        };
+    
         $.ajax({
-            contentType: "application/json; charset=utf-8",
-            type: "POST",
+            type: 'PUT',
             url: "/configuration/addConfigurationForYearMonth/"+yearMonth,
-            data: valueJson
-        }).then(function(data) {
-            dTable.row.add([
-                configId,
-                configName
-            ]).draw();
-        })
-    };
+            contentType: 'application/json; charset=utf-8',
+            data: JSON.stringify(JSONObject),
+            async: true,
+            // success: function(result) {
+            //     alert('Result: ' + result);
+            // },
+            // error: function(jqXHR, textStatus, errorThrown) {
+            //     alert("error"+jqXHR.status + ' ' + jqXHR.responseText);
+            // }
+        }).then(function(configId) {
+                    dTable.row.add([
+                        configId,
+                        configName
+                    ]).draw();
+                })
+    } 
 
-    App.prototype.deletetData = function(yearMonth) {
+    App.prototype.deleteData = function(deleteAll,yearMonth, configId, configName) {
         var dTable = $('#configTable').DataTable();
-        dTable.clear().draw();
+        var JSONObject= {
+            'configId': configId,
+            'configName': configName
+        };
         $.ajax({
             type: "DELETE",
-            url: "/configuration/deleteConfigurationsForYearMonth/"+yearMonth
+            url: "/configuration/deleteConfigurationsForYearMonth/"+yearMonth+"/"+deleteAll,
+            contentType: 'application/json; charset=utf-8',
+            data: JSON.stringify(JSONObject),
+            async: true,
         }).then(function(data) {
-            console.log("data: "+data);
-            $.each(data, function( index, configValue ) {
-                dTable.row.add([
-                    configValue.configId,
-                    configValue.configName
-                ]).draw();
-            });
+            if (deleteAll) dTable.clear().draw();
         })
     };
 
@@ -65,7 +72,7 @@
         dTable.clear().draw();
         $.ajax({
             type: "GET",
-            url: "/configuration/getConfigurationsForYearMonth/"+yearMonth
+            url: "configuration/getConfigurationsForYearMonth/"+yearMonth,
         }).then(function(data) {
             console.log("data: "+data);
             $.each(data, function( index, configValue ) {
@@ -79,13 +86,27 @@
 
     App.prototype.init = function() {
         $('#configTable').DataTable({
+            "columnDefs": [ {
+                "targets": 2,
+                "data": null,
+                "defaultContent": "<button>Delete</button>"
+            } ],
             scrollY: 300,
             paging: false,
             sorting: false,
             searching: false,
             info: false
         });
+        var dTable = $('#configTable').DataTable();
+        $('#configTable tbody').on( 'click', 'button', function () {
+            var data = dTable.row( $(this).parents('tr') ).data();
+            dTable.row( $(this).parents('tr') )
+            .remove()
+            .draw();
+            app.deleteData(false, document.getElementById("timePeriod").value, data[0], data[1]);
+        } );
     };
 
+
     window.app = new App;
 })($);
\ No newline at end of file