Overdue projects marked

src/main/java/Controller/TaskController/TasksServlet.java

@@ -9,8 +9,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.SQLException;
@@ -42,9 +40,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         /* get  input */
-
         PrintWriter out = response.getWriter();
-
         List<Task> tasks = taskDao.getTasks("","");
 
         String JSONdata;

src/main/java/Controller/TaskController/UpdateTaskStatusServlet.java

@@ -2,25 +2,21 @@
 
 import Dao.TaskDao;
 import Model.Task;
-import com.google.gson.Gson;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.sql.SQLException;
-import java.util.List;
-import java.util.UUID;
 
 @WebServlet("/updatetaskstatus")
-public class UpdateTaskStatusServlet  extends HttpServlet {
+public class UpdateTaskStatusServlet extends HttpServlet {
     private TaskDao taskDao = new TaskDao();
-
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-    	System.out.println("Updating Status... ");
+
+        System.out.println("Updating Status... ");
         String Id = request.getParameter("Id");
         if(!(Id.equals("") )){
             try {
@@ -30,9 +26,11 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             }
             System.out.println("Status updated");
         }
+
+
     }
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-    	this.doPost(request, response);
+    this.doPost(request, response);
     }
 }

src/main/java/Model/User.java

@@ -14,7 +14,6 @@ public class User {
     private Integer zipCode;
     private Date birthDate;
     private String role;
-    private String gender;
 
     public User() {
     }
@@ -34,7 +33,7 @@ public User(String userName, String passWord, String email, String fullName, Str
     }
 
     public User(Integer userId, String userName, String passWord, String email, String fullName, String state, String city,
-                String street, Integer zipCode, Date birthDate, String role, String gender) {
+                String street, Integer zipCode, Date birthDate, String role) {
         this.userId = userId;
         this.userName = userName;
         this.passWord = passWord;
@@ -46,16 +45,8 @@ public User(Integer userId, String userName, String passWord, String email, Stri
         this.zipCode = zipCode;
         this.birthDate = birthDate;
         this.role = role;
-        this.gender = gender;
-    }
-
-    public String getGender() {
-        return gender;
     }
 
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
     public Integer getUserId() {
         return userId;
     }

src/main/webapp/WEB-INF/header.jsp

@@ -15,14 +15,14 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class="">
                     <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                        <img src="images/img2.jpg" alt="">${userName}
+                        <img src="images/img2.jpg" alt="">${cookie['loginUser'].getValue()}
                         <span class=" fa fa-angle-down"></span>
                     </a>
                     <ul class="dropdown-menu dropdown-usermenu pull-right">
-                        <li><a href="${pageContext.request.contextPath}/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a></li>
+                        <li><a href="login.jsp"><i class="fa fa-sign-out pull-right"></i> Log Out</a></li>
                     </ul>
                 </li>
             </ul>
         </nav>
     </div>
-</div>
+</div>

src/main/webapp/css/custom.css

@@ -1,5 +1,6 @@
 .ajax-loader {
   display: none;
+  /*background-color: rgba(255,255,255,0.7);*/
   position: absolute;
   z-index: +100 !important;
   width: 50%;

src/main/webapp/home.jsp

@@ -244,7 +244,10 @@
   <script src="build/js/custom.min.js"></script>
   <!-- Initialize datetimepicker -->
   <script>
-      $('#myDatepicker').datetimepicker({format: 'MM/DD/YYYY'});
+    var date = new Date();
+    date.setDate(date.getDate()-1);
+      $('#myDatepicker').datetimepicker({format: 'MM/DD/YYYY',
+        startDate: date});
   </script>
 
 <script type="text/javascript" src="controller/tasks.js"></script>

src/main/webapp/vendors/pnotify/.bower.json

@@ -0,0 +1,47 @@
+{
+  "name": "pnotify",
+  "description": "JavaScript notification plugin.",
+  "main": [
+    "dist/pnotify.animate.js",
+    "dist/pnotify.brighttheme.css",
+    "dist/pnotify.buttons.css",
+    "dist/pnotify.buttons.js",
+    "dist/pnotify.callbacks.js",
+    "dist/pnotify.confirm.js",
+    "dist/pnotify.css",
+    "dist/pnotify.js",
+    "dist/pnotify.desktop.js",
+    "dist/pnotify.history.css",
+    "dist/pnotify.history.js",
+    "dist/pnotify.mobile.css",
+    "dist/pnotify.mobile.js",
+    "dist/pnotify.nonblock.js"
+  ],
+  "ignore": [
+    "build-tools/",
+    "includes/",
+    "devnote*.*",
+    "index.html",
+    "testing.html",
+    "buildcustom.php",
+    "package.json",
+    "src/"
+  ],
+  "license": [
+    "Apache-2.0"
+  ],
+  "dependencies": {
+    "jquery": ">=1.6"
+  },
+  "homepage": "https://github.com/sciactive/pnotify",
+  "version": "3.0.0",
+  "_release": "3.0.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "3.0.0",
+    "commit": "2c6a12b5d8a6b55d21beae5b35c2a643fcfe4a90"
+  },
+  "_source": "https://github.com/sciactive/pnotify.git",
+  "_target": "^3.0.0",
+  "_originalSource": "pnotify"
+}

src/main/webapp/vendors/pnotify/.gitignore

@@ -0,0 +1,4 @@
+bower_components
+node_modules
+libtests/browserify/node_modules
+libtests/browserify/bundle.js