From e01563aa127552652d90cd7afeb329d87f5181b0 Mon Sep 17 00:00:00 2001
From: DoLy <faurdorotheealidia@yahoo.com>
Date: Wed, 20 Jan 2021 22:10:53 +0200
Subject: [PATCH 1/2] Merge all the work into interviews-fixed

---
 .../comment/ejb/CommentBean.java              |  2 -
 .../comment/servlet/Comment.java              | 20 +--------
 .../interviews/ejb/InterviewBean.java         | 23 +---------
 .../interviews/ejb/ViewCandidatesBean.java    | 16 -------
 .../interviews/servlet/Interviews.java        | 45 +------------------
 .../interviews/servlet/ViewCandidates.java    |  2 -
 .../profile/servlet/Profile.java              |  7 +--
 .../pages/interview/comment-section.jsp       | 45 -------------------
 .../webapp/WEB-INF/pages/profile/profile.jsp  |  4 +-
 9 files changed, 8 insertions(+), 156 deletions(-)

diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
index ae75916..87ee1c2 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
@@ -33,8 +33,6 @@ public class CommentBean {
     public List<CommentDetails> getAllComments(Integer interviewId) {
         LOG.info("getAllComments");
         try {
-            //List<Comment> comments = (List<Comment>) em.createQuery("SELECT c FROM Comment c WHERE ").getResultList();
-            //return comments;
             TypedQuery<Comment> typedQuery = em.createQuery("SELECT c FROM Comment c WHERE c.interview.id = :id", Comment.class)
                 .setParameter("id", interviewId);
         List<Comment> comments = (List<Comment>)typedQuery.getResultList();
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
index 13bf7a6..f413e43 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
@@ -7,20 +7,14 @@
 
 import com.recruit.jobrecruiting.comment.ejb.CommentBean;
 import com.recruit.jobrecruiting.common.CommentDetails;
-import com.recruit.jobrecruiting.common.InterviewDetails;
 import com.recruit.jobrecruiting.entity.Interview;
 import com.recruit.jobrecruiting.entity.User;
 import com.recruit.jobrecruiting.interviews.ejb.InterviewBean;
 import com.recruit.jobrecruiting.user.ejb.UserBean;
 import com.recruit.jobrecruiting.validators.InterviewValidator;
-import com.recruit.jobrecruiting.validators.UserValidator;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.security.NoSuchAlgorithmException;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import javax.annotation.security.DeclareRoles;
@@ -77,17 +71,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         Integer id = Integer.parseInt(request.getParameter("id"));
         String username=request.getRemoteUser();
         User user=userBean.getUserByUsername(username);
-//        String jobpost=request.getParameter("jobpost");
-//        String candidate=request.getParameter("candidate");
-//        String interviewer=request.getParameter("interviewer");
-//        String status=request.getParameter("status");
         
         request.getSession().setAttribute("id", id);   
         request.getSession().setAttribute("user", user);
-//        request.getSession().setAttribute("jobpost", jobpost);
-//        request.getSession().setAttribute("candidate", candidate);
-//        request.getSession().setAttribute("interviewer", interviewer);
-//        request.getSession().setAttribute("status", status);
         List<CommentDetails> comments = commentBean.getAllComments(id);
         Interview interview = interviewBean.getInterviewById(id);
         request.getSession().setAttribute("comments", comments);
@@ -105,15 +91,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
      */
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        System.out.println("PPPPPPPOOOOOOOSSSSSSSSSTTTTTTT");
-        System.out.println (request.getParameter("form"));
-        
+            throws ServletException, IOException {      
         Integer id = Integer.parseInt(request.getParameter("id"));
         String formPosted = request.getParameter("form");
         
         if(formPosted.contentEquals("schedule")){
-            System.out.println("SCHEDULE");
             System.out.println (request.getParameter("date"));
             System.out.println (request.getParameter("time"));
             LocalDate interviewDate = LocalDate.parse(request.getParameter("date"));
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
index 3a85d42..75dfc66 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
@@ -6,7 +6,6 @@
 package com.recruit.jobrecruiting.interviews.ejb;
 
 import com.recruit.jobrecruiting.common.InterviewDetails;
-import com.recruit.jobrecruiting.common.UserDetails;
 import com.recruit.jobrecruiting.jobPost.ejb.JobPostBean;
 import com.recruit.jobrecruiting.entity.Interview;
 import com.recruit.jobrecruiting.entity.InterviewStatus;
@@ -14,12 +13,10 @@
 import com.recruit.jobrecruiting.entity.User;
 import com.recruit.jobrecruiting.user.ejb.UserBean;
 import com.recruit.jobrecruiting.util.Util;
-import java.sql.Time;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.ejb.EJBException;
@@ -48,7 +45,7 @@ public class InterviewBean {
     @PersistenceContext
     private EntityManager em;
 
-    public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)///////////doar cele pt care s-a stabilit interviul
+    public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)//doar cele pt care s-a stabilit interviul
     {
         try {
             TypedQuery<Interview> typedQuery = em.createQuery("SELECT i FROM Interview i WHERE (i.interviewer.id = :id AND i.status <> :st)", Interview.class)
@@ -56,9 +53,7 @@ public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)/////
             List<Interview> interviews = (List<Interview>) typedQuery.getResultList();
             for(Interview interview:interviews){
                 if(interview.checkAfterInterview()){
-                    interview.setStatus(InterviewStatus.AFTER_INTERVIEW);
-//                    TypedQuery<Interview> setStatus = em.createQuery("SELECT i FROM Interview i WHERE (i.interviewer.id = :id AND i.status <> :st)", Interview.class)
-//                            UPDATE Interview i SET i.               
+                    interview.setStatus(InterviewStatus.AFTER_INTERVIEW);    
                     em.persist(interview);
                 }
             }
@@ -238,18 +233,4 @@ public void setPlace(Integer id, String place){
         }
     } 
     
-    //trebuie in clasa Interview
-//    public Boolean checkAfterInterview(Interview interview){
-//        if((interview.getStatus()==InterviewStatus.BEFORE_INTERVIEW) && (LocalDate.now().isAfter(interview.getDate())))
-//            return Boolean.TRUE;
-//        return Boolean.FALSE;
-//    }
-    
-//    private String getDateTime() {
-//    DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-//    Date date = new Date();
-//    return dateFormat.format(date);
-//}
-//    var dt = new DateTime(1970, 1, 1, 0, 0, 0, 0).AddSeconds(Math.Round(1372061224000 / 1000d)).ToLocalTime();
-//Console.WriteLine(dt); // Prints: 6/24/2013 10:07:04 AM
 }
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
index ad76dc0..ccbaa14 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
@@ -46,10 +46,6 @@ public List<InterviewDetails> getAllCandidates() {
                     .setParameter("interviewStatus", InterviewStatus.APPLIED_FOR);
 
             List<Interview> candidates = (List<Interview>) typedQuery.getResultList();
-//        Query query = em.createQuery("SELECT i FROM Interviews i WHERE i.status = :interviewStatus")
-//                .setParameter("interviewStatusid", InterviewStatus.WAITING_INTERVIEW_DATE);
-
-            //List<Interview> candidates = (List<Interview>)query.getResultList();
             List<InterviewDetails> x = copyCandidateToDetails(candidates);
             return x;
         } catch (Exception ex) {
@@ -57,18 +53,6 @@ public List<InterviewDetails> getAllCandidates() {
         }
     }
 
-//    public List<InterviewDetails> getAllInterviewsAsCandidate(Integer userId)
-//    {
-//        try {
-//            TypedQuery<Interview> typedQuery = em.createQuery("SELECT i FROM interviews i WHERE i.candidate_key = :id", Interview.class)
-//                .setParameter("id", userId);
-//        List<Interview> interviews = (List<Interview>)typedQuery.getResultList();
-//        List<InterviewDetails> x = copyInterviewToDetails(interviews);
-//        return x;
-//        } catch (Exception ex) {
-//            throw new EJBException(ex);
-//        }
-//    }
     private List<InterviewDetails> copyCandidateToDetails(List<Interview> candidates) {
         List<InterviewDetails> detailsList = new ArrayList<>();
         for (Interview candidate : candidates) {
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
index b0efd78..2dae69e 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
@@ -6,7 +6,6 @@
 package com.recruit.jobrecruiting.interviews.servlet;
 
 import com.recruit.jobrecruiting.common.InterviewDetails;
-import com.recruit.jobrecruiting.entity.Position;
 import com.recruit.jobrecruiting.entity.User;
 import com.recruit.jobrecruiting.interviews.ejb.InterviewBean;
 import com.recruit.jobrecruiting.user.ejb.UserBean;
@@ -72,41 +71,13 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        System.out.println("INTERVIEWS.JAVA");
         String username=request.getRemoteUser();
         User user=userBean.getUserByUsername(username);
         Integer userId=user.getId();
-        //String userId=request.getParameter("id");
-        //userId=request.
-        //Integer userIdInt=Integer.parseInt(userId);
-        //String requestedBy=request.getParameter("requestedBy");/////////////////////params
         
-        List<InterviewDetails> interviews;         //!!!!!!!!schimbare light details
-//        if(request.isUserInRole("CandidateRole"))
-//            interviews = interviewBean.getAllInterviewsAsCandidate(userId);
-//        else
-//            interviews = interviewBean.getAllInterviewsAsInterviewer(userId);
-//        Boolean candidate=Boolean.FALSE;
-//        if(user.getPosition().compareTo(Position.CANDIDATE)==0)
-//        {
-//            interviews = interviewBean.getAllInterviewsAsCandidate(userId);
-//            candidate=Boolean.TRUE;
-//        }         
-//        else
-//            interviews = interviewBean.getAllInterviewsAsInterviewer(userId);
-//        if (request.getPathInfo().compareTo("/Profile")==0)
-//        {
-         interviews=interviewBean.getAllInterviewsAsInterviewer(userId);
-//        }
-//        else
-//        {
-//            interviews = interviewBean.getAllInterviewsAsCandidate(userId);
-//        }
-        
-        //interv as candidate
-         
+        List<InterviewDetails> interviews;      
+        interviews=interviewBean.getAllInterviewsAsInterviewer(userId);
         request.getSession().setAttribute("interviews", interviews);   
-        //request.getSession().setAttribute("candidate", candidate);
         request.getRequestDispatcher("/WEB-INF/pages/interview/interviews.jsp").forward(request, response);
 
     }
@@ -122,18 +93,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-//        String id=request.getParameter("id");
-//        String jobpost=request.getParameter("jobpost");
-//        String candidate=request.getParameter("candidate");
-//        String interviewer=request.getParameter("interviewer");
-//        String status=request.getParameter("status");
-//        
-//        request.getSession().setAttribute("id", id);   
-//        request.getSession().setAttribute("jobpost", jobpost);
-//        request.getSession().setAttribute("candidate", candidate);
-//        request.getSession().setAttribute("interviewer", interviewer);
-//        request.getSession().setAttribute("status", status);
-//        request.getRequestDispatcher("/WEB-INF/pages/interview/comment-section.jsp").forward(request, response);
         
     }
 
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
index 52e2750..3725309 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
@@ -71,8 +71,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
         List<InterviewDetails> candidates = viewCandidatesBean.getAllCandidates();
-         
-        //request.getSession().setAttribute("candidates", candidates);
         request.getSession().setAttribute("candidates", candidates);   
         request.getRequestDispatcher("/WEB-INF/pages/interview/viewCandidates.jsp").forward(request, response);
 
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
index d25ad70..171ef7e 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
@@ -2,7 +2,6 @@
 
 import com.recruit.jobrecruiting.comment.ejb.CommentBean;
 import com.recruit.jobrecruiting.common.InterviewDetails;
-import com.recruit.jobrecruiting.entity.Position;
 import com.recruit.jobrecruiting.entity.User;
 import com.recruit.jobrecruiting.interviews.ejb.InterviewBean;
 import com.recruit.jobrecruiting.user.ejb.UserBean;
@@ -49,11 +48,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             User user = userBean.getUserByUsername(username);
             request.setAttribute("user", user);
             
-            //My interviews
-//            List<InterviewDetails> interviews = interviewBean.getAllInterviewsAsCandidate(user.getId());
-//              request.setAttribute("interviews", interviews);
-//              
-//            request.getRequestDispatcher("/WEB-INF/pages/profile/profile.jsp").forward(request, response);
+
             Integer id=user.getId();
             List<InterviewDetails> interviews;
             interviews = interviewBean.getAllInterviewsAsCandidate(id);
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
index cb16d76..59b77cb 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
@@ -34,24 +34,17 @@
                 <div class="col-md-6">
                     <c:if test="${interview.status=='WAITING_INTERVIEW_DATE'}">
                         <h3>Interview is not established yet</h3>
-                        <!--${interview.dateTime}-->
                         <c:if test="${user.id==interview.interviewer.id}">
-<!--                            <form action = "/cgi-bin/test.cgi" name = "myForm" onsubmit = "return(validate());">-->
                             <form method="POST" action="${pageContext.request.contextPath}/Comment?id=${id}&form=schedule" name="schedule" onsubmit = "return(validate());">
                                 <h3 class="mb-4"><label> Date: </label>
-                                    <c:if test="${interview.dateTime != null}">
-<!--                                    <input name="date" type="" value="" required>-->
-                                    </c:if>
                                     <input name="date" type="date" value="" required>
                                     <t:displayError error="date"/>
                                 </h3>
-                                                 <!--2021-01-19 22:09:55.271-->
                                 <h3 class="mb-4"><label> Time: </label>
                                                  <input name="time" type="time" value="" required ></h3>
                                 <h3 class="mb-4"><label> Place: </label>
                                                  <input name="place" type="text" value="${interview.place}" placeholder="Place" required></h3>
                                 <button class=" btn btn-profile col-xl btn btn-primary"  type="submit">Schedule interview</button>
-<!--<a href="${pageContext.request.contextPath}/Comment?id=${interview.id}" role="button" class=" btn-profile col-xl btn btn-primary">View Interview</a>-->
                             </form>
                             <t:formValidate/>
                         </c:if>
@@ -61,11 +54,6 @@
                         <h3>- date : ${interview.getDate()}</h3>
                         <h3>- time : ${interview.getTime()}</h3>
                         <h3>- place: ${interview.place}</h3>
-<!--                        <c:if test="${user.id==interview.interviewer.id}">
-                            <form method="POST" action="${pageContext.request.contextPath}/Comment?id=${id}&form=change">
-                                <button class=" btn btn-profile"  type="submit">Request change</button>
-                            </form>
-                            </c:if>-->
                     </c:if>
                 </div>
             </div>
@@ -106,37 +94,4 @@
         </div>
     </section>
                         
-<!--    <script type = "text/javascript">
-      // Form validation code will come here.
-      function validate() {
-         System.out.println("VALIDATE DATA FUNCTION");
-         if( document.schedule.date.toLocaleString().localeCompare(Date.getDate().toLocaleString()) <= 0 ) {
-            System.out.println("DATA TRECUTA");
-            alert( "Please set a future day!" );
-            document.date.focus() ;
-            return false;
-         }
-         System.out.println("DATA OK");
-         return (true);
-         }
-         
-//         if( document.myForm.EMail.value == "" ) {
-//            alert( "Please provide your Email!" );
-//            document.myForm.EMail.focus() ;
-//            return false;
-//         }
-//         if( document.myForm.Zip.value == "" || isNaN( document.myForm.Zip.value ) ||
-//            document.myForm.Zip.value.length != 5 ) {
-//            
-//            alert( "Please provide a zip in the format #####." );
-//            document.myForm.Zip.focus() ;
-//            return false;
-//         }
-//         if( document.myForm.Country.value == "-1" ) {
-//            alert( "Please provide your country!" );
-//            return false;
-//         }
-//         return( true );
-//      }
-</script>-->
 </t:pageTemplate>
\ No newline at end of file
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
index 4d2c94b..6df28df 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
@@ -146,7 +146,7 @@
                         </li>
 
                     </ul>
-
+                            <%--my interviews--%>
                     <div class="tab-content" id="myTabContent" style="height: 470px;">
                         <div class="tab-pane fade show active" id="interviews" role="tabpanel" aria-labelledby="interviews">
 
@@ -172,7 +172,7 @@
                                 </c:if>
                             </c:forEach>
                         </div>
-
+                        <%--my applications--%>
                         <div class="tab-pane fade" id="applications" role="tabpanel" aria-labelledby="applications">
                             <c:forEach var="interview" items="${interviews}" varStatus="status">
                                 <c:if test="${interview.interviewStatus=='APPLIED_FOR'}" >

From ded0d554767e46fde2d3b5ea1d12d92d04ba4315 Mon Sep 17 00:00:00 2001
From: DoLy <faurdorotheealidia@yahoo.com>
Date: Fri, 22 Jan 2021 11:01:28 +0200
Subject: [PATCH 2/2] Hope not final braincell used :))

Adding coments
Cleaning code
---
 .../comment/ejb/CommentBean.java              |  5 +-
 .../comment/servlet/Comment.java              | 28 ++++------
 .../interviews/ejb/InterviewBean.java         | 41 +++++++++++++-
 .../interviews/ejb/ViewCandidatesBean.java    |  2 +-
 .../interviews/servlet/Interviews.java        | 11 ++--
 .../interviews/servlet/ViewCandidates.java    |  4 +-
 .../profile/servlet/Profile.java              |  7 ++-
 .../pages/interview/comment-section.jsp       | 10 ++--
 .../WEB-INF/pages/interview/interviews.jsp    | 54 ++++++-------------
 .../pages/interview/viewCandidates.jsp        | 23 ++++----
 .../webapp/WEB-INF/pages/profile/profile.jsp  |  4 +-
 11 files changed, 99 insertions(+), 90 deletions(-)

diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
index 87ee1c2..6f88d20 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/ejb/CommentBean.java
@@ -20,7 +20,7 @@
 
 /**
  *
- * @author Deea
+ * @author Deea, (Doly)
  */
 @Stateless
 public class CommentBean {
@@ -70,7 +70,8 @@ public void createComment(String username, String comment_text, Integer intervie
         interview.getComments().add(comment);
         if(interview.getStatus()==InterviewStatus.APPLIED_FOR){
             interview.setStatus(InterviewStatus.WAITING_INTERVIEW_DATE);
-        }
+        }//the status of the interview is updated when the interviewer
+         //writes the first comment
         comment.setInterview(interview);
 
         em.persist(comment);
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
index f413e43..cf74b14 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/comment/servlet/Comment.java
@@ -27,9 +27,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
+/**Servlet that manages comments and interview
+ * Linked to comment-section.jsp
  *
- * @author Deea
+ * @author Deea, Doly, Robert
  */
 @DeclareRoles({"AdminRole", "CandidateRole", "DepartmentDirectorRole", "GeneralDirectorRole", "HRDirectorRole", "RecruiterRole"})
 @ServletSecurity(value = @HttpConstraint(rolesAllowed={"AdminRole", "CandidateRole", "DepartmentDirectorRole", "GeneralDirectorRole", "HRDirectorRole", "RecruiterRole"}))
@@ -70,8 +71,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         Integer id = Integer.parseInt(request.getParameter("id"));
         String username=request.getRemoteUser();
-        User user=userBean.getUserByUsername(username);
-        
+        User user=userBean.getUserByUsername(username);        
         request.getSession().setAttribute("id", id);   
         request.getSession().setAttribute("user", user);
         List<CommentDetails> comments = commentBean.getAllComments(id);
@@ -95,9 +95,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         Integer id = Integer.parseInt(request.getParameter("id"));
         String formPosted = request.getParameter("form");
         
-        if(formPosted.contentEquals("schedule")){
-            System.out.println (request.getParameter("date"));
-            System.out.println (request.getParameter("time"));
+        if(formPosted.equals("schedule")){
             LocalDate interviewDate = LocalDate.parse(request.getParameter("date"));
             LocalTime interviewTime = LocalTime.parse(request.getParameter("time"));
             HashMap<String, String> messageBag = new HashMap<>();
@@ -110,18 +108,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             else{
                 request.setAttribute("errors", messageBag);
                 request.getRequestDispatcher("/WEB-INF/pages/interview/comment-section.jsp").include(request, response);
-            }
-         
+            }       
         }
-        else{
-            if(formPosted.contentEquals("change")){
-                
-            }
-            else{   //comment
-                String username = request.getRemoteUser();
-                String comment = request.getParameter("comment");
-                commentBean.createComment(username, comment, id);
-            }
+        else{   //comment
+            String username = request.getRemoteUser();
+            String comment = request.getParameter("comment");
+            commentBean.createComment(username, comment, id);
         }
            
         response.sendRedirect(request.getContextPath()+"/Comment?id="+id.toString());
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
index 75dfc66..6114711 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/InterviewBean.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Doly, robert, denisa
+ * @author Andrei, Doly, robert, denisa
  */
 @Stateless
 public class InterviewBean {
@@ -45,7 +45,13 @@ public class InterviewBean {
     @PersistenceContext
     private EntityManager em;
 
-    public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)//doar cele pt care s-a stabilit interviul
+    /**
+     * Gets all interviews for a specific interviewer.
+     *
+     * @param userId the id of the Interviewer
+     * @return Returns the list of interview details
+     */
+    public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)
     {
         try {
             TypedQuery<Interview> typedQuery = em.createQuery("SELECT i FROM Interview i WHERE (i.interviewer.id = :id AND i.status <> :st)", Interview.class)
@@ -64,6 +70,12 @@ public List<InterviewDetails> getAllInterviewsAsInterviewer(Integer userId)//doa
         }
     }
 
+    /**
+     * Gets all interviews for a specific candidate.
+     *
+     * @param userId the id of the Candidate
+     * @return Returns the list of interview details
+     */
     public List<InterviewDetails> getAllInterviewsAsCandidate(Integer userId) {
         try {
             TypedQuery<Interview> typedQuery = em.createQuery("SELECT i FROM Interview i WHERE i.candidate.id = :id", Interview.class)
@@ -82,6 +94,12 @@ public List<InterviewDetails> getAllInterviewsAsCandidate(Integer userId) {
         }
     }
 
+    /**
+     * Gets all interview details for an Interview list.
+     *
+     * @param interviews the list of interview objects
+     * @return Returns the list of interview details
+     */
     private List<InterviewDetails> copyInterviewToDetails(List<Interview> interviews) {
         List<InterviewDetails> detailsList = new ArrayList<>();
         for (Interview interview : interviews) {
@@ -202,6 +220,12 @@ private InterviewDetails copyInterviewToDetails(Interview interview) {
         return interviewDetails;
     }
 
+     /**
+     * Gets an interview by its id.
+     *
+     * @param id the id of the interview
+     * @return Returns the interview object
+     */
     public Interview getInterviewById(Integer id) {
         return em.find(Interview.class, id);
     }
@@ -210,6 +234,13 @@ public LocalDateTime toDateTime(LocalDate date, LocalTime time){
         return LocalDateTime.of(date, time);
     }
     
+    /**
+     * Sets the dateTime attribute of an interview. 
+     *
+     * @param id the id of the interview
+     * @param date when the interview is scheduled
+     * @param time when the interview is scheduled
+     */
      public void setDateTime(Integer id, LocalDate date, LocalTime time){
         try {
             Interview interview = em.find(Interview.class, id);
@@ -222,6 +253,12 @@ public void setDateTime(Integer id, LocalDate date, LocalTime time){
         }
      }
         
+    /**
+     * Sets the place of the recently scheduled interview.
+     * 
+     * @param id
+     * @param place 
+     */
     public void setPlace(Integer id, String place){
         try {
             Interview interview = em.find(Interview.class, id);
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
index ccbaa14..0dac830 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/ejb/ViewCandidatesBean.java
@@ -23,7 +23,7 @@
 
 /**
  *
- * @author Doly
+ * @author Doly,...
  */
 @Stateless
 public class ViewCandidatesBean {
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
index 2dae69e..b2f8266 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/Interviews.java
@@ -14,15 +14,18 @@
 import java.util.List;
 import javax.inject.Inject;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.HttpConstraint;
+import javax.servlet.annotation.ServletSecurity;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- *
- * @author Doly
+/**Servlet that manages the interviews to be transmitted to interviews.jsp
+ * Candidate access is forbidden!!!
+ * @author Andrei, Doly
  */
+@ServletSecurity(value = @HttpConstraint(rolesAllowed={"AdminRole","DepartmentDirectorRole","GeneralDirectorRole","HRDirectorRole","RecruiterRole"}))
 @WebServlet(name = "Interviews", urlPatterns = {"/Interviews"})
 public class Interviews extends HttpServlet {
 
@@ -74,7 +77,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         String username=request.getRemoteUser();
         User user=userBean.getUserByUsername(username);
         Integer userId=user.getId();
-        
+
         List<InterviewDetails> interviews;      
         interviews=interviewBean.getAllInterviewsAsInterviewer(userId);
         request.getSession().setAttribute("interviews", interviews);   
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
index 3725309..af6c695 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/interviews/servlet/ViewCandidates.java
@@ -19,7 +19,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
+/**Servlet that manages the candidates to be seen on viewCandidates JSP
+ * Only doGet method is implemented
+ * Candidates access is forbidden!
  *
  * @author Doly
  */
diff --git a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
index 171ef7e..203ce72 100644
--- a/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
+++ b/JobRecruiting/JobRecruiting/src/main/java/com/recruit/jobrecruiting/profile/servlet/Profile.java
@@ -17,9 +17,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
+/**Servlet that manages candidate's information to be sent to remoteProfile.jsp /
+ * user's information + personal interviews information for profile.jsp
  *
- * @author Andreea Purta
+ * @author Andreea Purta, (Doly)
  */
 @DeclareRoles({"AdminRole", "CandidateRole", "DepartmentDirectorRole", "GeneralDirectorRole", "HRDirectorRole", "RecruiterRole"})
 @ServletSecurity(value = @HttpConstraint(rolesAllowed = {"AdminRole", "CandidateRole", "DepartmentDirectorRole", "GeneralDirectorRole", "HRDirectorRole", "RecruiterRole"}))
@@ -47,8 +48,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             String username = request.getRemoteUser();
             User user = userBean.getUserByUsername(username);
             request.setAttribute("user", user);
-            
-
             Integer id=user.getId();
             List<InterviewDetails> interviews;
             interviews = interviewBean.getAllInterviewsAsCandidate(id);
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
index 59b77cb..389fd86 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/comment-section.jsp
@@ -1,7 +1,7 @@
 <%-- 
     Document   : comment-section
     Created on : Jan 11, 2021, 7:36:18 PM
-    Author     : Deea
+    Author     : Deea, Doly, Denisa, Robert
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -26,16 +26,13 @@
                     <h3 class="mb-4">Job Post: ${interview.jobPost.title}</h3>
                     <h3 class="mb-4">Candidate: ${interview.candidate.getName()} </h3>
                     <h3 class="mb-4">Interviewer: ${interview.interviewer.getName()}</h3>
-                    <c:if test="${LocalDate.now().isAfter(interview.getdate())}">
-                        interview
-                    </c:if>
                     <h3 class="mb-4">Interview status: ${interview.status}</h3> 
                 </div>
                 <div class="col-md-6">
                     <c:if test="${interview.status=='WAITING_INTERVIEW_DATE'}">
                         <h3>Interview is not established yet</h3>
                         <c:if test="${user.id==interview.interviewer.id}">
-                            <form method="POST" action="${pageContext.request.contextPath}/Comment?id=${id}&form=schedule" name="schedule" onsubmit = "return(validate());">
+                            <form method="POST" action="${pageContext.request.contextPath}/Comment?id=${id}&form=schedule" onsubmit="return(validate());">
                                 <h3 class="mb-4"><label> Date: </label>
                                     <input name="date" type="date" value="" required>
                                     <t:displayError error="date"/>
@@ -55,8 +52,9 @@
                         <h3>- time : ${interview.getTime()}</h3>
                         <h3>- place: ${interview.place}</h3>
                     </c:if>
-                </div>
+                </div>                
             </div>
+        </div>
     </section>
                 
     <section class="content-item" id="comments">
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/interviews.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/interviews.jsp
index abc1251..47a6c56 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/interviews.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/interviews.jsp
@@ -1,7 +1,7 @@
 <%-- 
     Document   : inerviews
     Created on : Jan 14, 2021, 1:39:31 PM
-    Author     : Doly
+    Author     : Doly, Andrei, Andreea Purta
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -14,41 +14,21 @@
 <fmt:setBundle basename="messages" />
 
 <t:pageTemplate pageTitle="Interviews">
-
-  
- <div class="container-management">
-    <c:forEach var="interview" items="${interviews}">
-        <div class="row">
-            <div class="col-md">
-                ${interview.jobpost.title}
-            </div>
-            
-            <div class="col-md">
-                <c:choose>
-                    <c:when test="${candidate}">    
-                        ${interview.interviewer.getName()}
-                    </c:when>
-                    <c:otherwise>
-                        ${interview.candidate.getName()}
-                    </c:otherwise>
-                </c:choose>
-            </div>
-            
-            <div class="col-md">
-                ${interview.interviewStatus}
-            </div>
-            
-            <div class="col-md">
-            <c:choose>
-                <c:when test="${interview.isAppliedFor()}">    
-                </c:when>
-                <c:otherwise>      
-                        <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Comment?id=${interview.id}" role="button"><fmt:message key="label.interviews.viewconversation" /></a>               
-                </c:otherwise>
-            </c:choose>
+    <div class="container-management">
+        <h1 class="mb-4">Interviews</h1>
+        <c:forEach var="interview" items="${interviews}">
+            <div class="row">
+                <div class="col-md">${interview.jobpost.title}</div>         
+                <div class="col-md">${interview.candidate.getName()}</div>           
+                <div class="col-md"> ${interview.interviewStatus}</div>
+                <div class="col-md">
+                    <c:if test="${interview.interviewStatus!=InterviewStatus.APPLIED_FOR}">      
+                        <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Comment?id=${interview.id}" role="button">
+                            <fmt:message key="label.interviews.viewconversation" />
+                        </a>               
+                    </c:if>
+                </div>            
             </div>
-            
-        </div>
-    </c:forEach>
-</div>
+        </c:forEach>
+    </div>
 </t:pageTemplate>
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/viewCandidates.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/viewCandidates.jsp
index b81bd00..2314e47 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/viewCandidates.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/interview/viewCandidates.jsp
@@ -1,7 +1,7 @@
 <%-- 
     Document   : viewCandidates
     Created on : Jan 15, 2021, 10:26:33 AM
-    Author     : Doly
+    Author     : Doly, Andreea Purta
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -18,20 +18,17 @@
         <h1 class="mb-4">Candidates</h1>
         <c:forEach var="candidate" items="${candidates}">
             <div class="row">
+                <div class="col-md">${candidate.getCandidateFullName()}</div>
+                <div class="col-md">${candidate.jobpost.title}</div>
                 <div class="col-md">
-                    ${candidate.getCandidateFullName()}
+                    <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Profile?id=${candidate.candidate.id}" role="button">
+                        <fmt:message key="label.viewCandidates.viewProfile" />
+                    </a>
                 </div>
-
-                <div class="col-md">
-                    ${candidate.jobpost.title}
-                </div>
-
-                <div class="col-md">
-                    <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Profile?id=${candidate.candidate.id}" role="button"><fmt:message key="label.viewCandidates.viewProfile" /></a>
-                </div>
-
-                <div class="col-md"> <%-------------------TO DO---------------------------------%>
-                    <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Comment?id=${candidate.id}" role="button"><fmt:message key="label.viewCandidates.planInterview" /></a>
+                <div class="col-md"> 
+                    <a class="btn btn-secondary" href="${pageContext.request.contextPath}/Comment?id=${candidate.id}" role="button">
+                        <fmt:message key="label.viewCandidates.planInterview" />
+                    </a>
                 </div>
             </div>
         </c:forEach>
diff --git a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
index 6df28df..0204bb7 100644
--- a/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
+++ b/JobRecruiting/JobRecruiting/src/main/webapp/WEB-INF/pages/profile/profile.jsp
@@ -1,7 +1,7 @@
 <%-- 
     Document   : profile
     Created on : 12-Jan-2021, 12:13:31
-    Author     : Andreea Purta
+    Author     : Andreea Purta, (Doly)
 --%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
@@ -146,7 +146,7 @@
                         </li>
 
                     </ul>
-                            <%--my interviews--%>
+                    <%--my interviews--%>
                     <div class="tab-content" id="myTabContent" style="height: 470px;">
                         <div class="tab-pane fade show active" id="interviews" role="tabpanel" aria-labelledby="interviews">