-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Snir001/ShareIT
i changed search to smartSearch in /ResultsServlet.java
- Loading branch information
Showing
24 changed files
with
677 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| this is list of ${name} Offers | ||
| <%@page import="model.Users"%> | ||
| <%@page import="model.Requests"%> | ||
| <%@page import="java.util.*"%> | ||
|
|
||
| <div class="w3-container"> | ||
| <h2>Users:</h2> | ||
|
|
||
| <table class="w3-table w3-striped"> | ||
| <tr> | ||
| <th>Item ID</th> | ||
| <th>Item Name</th> | ||
| <th>Item Owner</th> | ||
| <th>Category</th> | ||
| <th>Value</th> | ||
| <th>Condition</th> | ||
| <th>Picture</th> | ||
| <th>Delete</th> | ||
|
|
||
|
|
||
|
|
||
| </tr> | ||
|
|
||
| <% | ||
| model.Model mod = (model.Model)getServletContext().getAttribute("model"); | ||
| List<model.Items> items=(List<model.Items>)request.getAttribute("items"); | ||
| String status; | ||
| model.Items item; | ||
| for(int i=0;i<items.size();i++) { | ||
| item=items.get(i); | ||
| /* | ||
| <th>Item ID</th> | ||
| <th>Item Name</th> | ||
| <th>Item Owner</th> | ||
| <th>Category</th> | ||
| <th>Value</th> | ||
| <th>Condition</th> | ||
| <th>Picture</th> | ||
| <th>Delete</th> | ||
| http://localhost:8080/ShareIT/ProfilePageServlet?user_name=Idan_Sh | ||
| */ | ||
| out.println("<tr>"); | ||
| out.println("<td>"+item.getItemID()+"</td>"); | ||
| out.println("<td>"+item.getName()+"</td>"); | ||
| out.println("<td><a href='ProfilePageServlet?user_name="+mod.getUserByID(item.getOwnerID()).getUserName()+"'>"+mod.getUserByID(item.getOwnerID()).getUserName()+"</a></td>"); | ||
| out.println("<td>"+item.getCategory()+"</td>"); | ||
| out.println("<td>"+item.getItemValue()+"</td>"); | ||
| out.println("<td>"+item.getCondition()+"</td>"); | ||
| out.println("<td>"+item.getPicture()+"</td>"); | ||
| out.println("<td><a href='RemoveItemServlet?item_id="+item.getItemID()+"'>X</a></td>"); | ||
| out.println("</tr>"); | ||
| } | ||
| %> | ||
| </table> | ||
| </div> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| this is list of ${name} Offers | ||
| <%@page import="model.Users"%> | ||
| <%@page import="model.Requests"%> | ||
| <%@page import="java.util.*"%> | ||
|
|
||
| <div class="w3-container"> | ||
| <h2>Users:</h2> | ||
|
|
||
| <table class="w3-table w3-striped"> | ||
| <tr> | ||
| <th>User ID</th> | ||
| <th>User Name</th> | ||
| <th>Last Name</th> | ||
| <th>First Name</th> | ||
| <th>Mail</th> | ||
| <th>City</th> | ||
| <th>Address</th> | ||
| <th>Phone</th> | ||
| <th>Gender</th> | ||
| <th>privleges</th> | ||
| <th>Make Admin</th> | ||
|
|
||
| <th>Delete</th> | ||
|
|
||
|
|
||
|
|
||
| </tr> | ||
|
|
||
| <% | ||
| List<model.Users> users=(List<model.Users>)request.getAttribute("users"); | ||
| String status; | ||
| Users u; | ||
| for(int i=0;i<users.size();i++) { | ||
| u=users.get(i); | ||
| /* | ||
| <th>User ID</th> | ||
| <th>User Name</th> | ||
| <th>Last Name</th> | ||
| <th>First Name</th> | ||
| <th>Mail</th> | ||
| <th>City</th> | ||
| <th>Address</th> | ||
| <th>Phone</th> | ||
| <th>Gender</th> | ||
| <th>privleges</th> | ||
| http://localhost:8080/ShareIT/ProfilePageServlet?user_name=Idan_Sh | ||
| */ | ||
| out.println("<tr>"); | ||
| out.println("<td>"+u.getUserID()+"</td>"); | ||
| out.println("<td><a href='ProfilePageServlet?user_name="+u.getUserName()+"'>"+u.getUserName()+"</a></td>"); | ||
| out.println("<td>"+u.getLastName()+"</td>"); | ||
| out.println("<td>"+u.getFirstName()+"</td>"); | ||
| out.println("<td>"+u.getMail()+"</td>"); | ||
| out.println("<td>"+u.getCity()+"</td>"); | ||
| out.println("<td>"+u.getAddress()+"</td>"); | ||
| out.println("<td>"+u.getPhone()+"</td>"); | ||
| out.println("<td>"+u.getGender()+"</td>"); | ||
| out.println("<td>"+u.getPrivileges()+"</td>"); | ||
| out.println("<td><a href='MakeAdminServlet?user_id="+u.getUserID()+"'>A</a></td>"); | ||
| out.println("<td><a href='RemoveUserServlet?user_id="+u.getUserID()+"'>X</a></td>"); | ||
| out.println("</tr>"); | ||
| } | ||
| %> | ||
| </table> | ||
| </div> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <%@page import="model.Users"%> | ||
| <%model.Users u=(model.Users)request.getAttribute("show_user"); %> | ||
| User Name: <%out.print(u.getUserName()); %> <br> | ||
| First Name:<%out.print(u.getFirstName()); %> <br> | ||
| Last Name:<%out.print(u.getLastName()); %> <br> | ||
| Email:<%out.print(u.getMail()); %> <br> | ||
| City:<%out.print(u.getCity()); %> <br> | ||
| Address:<%out.print(u.getAddress()); %> <br> | ||
| Phone:<%out.print(u.getPhone()); %> <br> | ||
| Gender:<%out.print(u.getGender()); %> <br> | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.