From cb5f580105119669c3cfbcb7c4df984c2f185f78 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:51:56 +0530
Subject: [PATCH 03/44] Update adminHome.jsp
---
tendermanagement/WebContent/adminHome.jsp | 123 +++++++++++++++++++---
1 file changed, 106 insertions(+), 17 deletions(-)
diff --git a/tendermanagement/WebContent/adminHome.jsp b/tendermanagement/WebContent/adminHome.jsp
index e7b1333..e89e00e 100644
--- a/tendermanagement/WebContent/adminHome.jsp
+++ b/tendermanagement/WebContent/adminHome.jsp
@@ -1,10 +1,10 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
- <%@page import="java.sql.*, com.hit.utility.DBUtil, javax.servlet.annotation.WebServlet" errorPage="errorpage.jsp"%>
+ <%@page import="java.sql.*, java.lang.Integer,com.hit.beans.VendorBean,com.hit.utility.DBUtil,java.util.List,java.util.ArrayList,com.hit.dao.VendorDaoImpl,com.hit.dao.VendorDao, javax.servlet.annotation.WebServlet" errorPage="errorpage.jsp"%>
-
+
@@ -19,15 +19,77 @@
+
+
<%
String user = (String)session.getAttribute("user");
String uname = (String)session.getAttribute("username");
String pword = (String)session.getAttribute("password");
- if(!user.equalsIgnoreCase("admin") || uname.equals("") || pword.equals("")){
+ if(user==null || !user.equalsIgnoreCase("admin") || uname.equals("") || pword.equals("")){
response.sendRedirect("loginFailed.jsp");
@@ -42,7 +104,7 @@
+
Tender Management System
+ E-marketplace
From 865da63d3c8f026bd91899833e93763340d1f894 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:53:20 +0530
Subject: [PATCH 06/44] Update adminViewVendor.jsp
From c3594c23d6402a580ce77549c74f02ec4b6d8043 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:53:32 +0530
Subject: [PATCH 07/44] Update adminViewVendorDetail.jsp
---
tendermanagement/WebContent/adminViewVendorDetail.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tendermanagement/WebContent/adminViewVendorDetail.jsp b/tendermanagement/WebContent/adminViewVendorDetail.jsp
index f22a15d..d4db561 100644
--- a/tendermanagement/WebContent/adminViewVendorDetail.jsp
+++ b/tendermanagement/WebContent/adminViewVendorDetail.jsp
@@ -10,7 +10,7 @@
- Tender Management System
+ E-marketplace
From 43701c721a549cf689e39b1b13fe86a9e65a470c Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:53:52 +0530
Subject: [PATCH 08/44] Update approved.jsp
---
tendermanagement/WebContent/approved.jsp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tendermanagement/WebContent/approved.jsp b/tendermanagement/WebContent/approved.jsp
index 7b0dcbe..4a0c79e 100644
--- a/tendermanagement/WebContent/approved.jsp
+++ b/tendermanagement/WebContent/approved.jsp
@@ -15,8 +15,7 @@
%>
Tender Management System
+E-marketplace
@@ -75,8 +75,8 @@
@@ -64,23 +126,50 @@
From b8564088746784185bdda077cee7596de438cbf6 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:52:15 +0530
Subject: [PATCH 04/44] Update adminHome.jsp
---
tendermanagement/WebContent/adminHome.jsp | 123 +++-------------------
1 file changed, 17 insertions(+), 106 deletions(-)
diff --git a/tendermanagement/WebContent/adminHome.jsp b/tendermanagement/WebContent/adminHome.jsp
index e89e00e..e7b1333 100644
--- a/tendermanagement/WebContent/adminHome.jsp
+++ b/tendermanagement/WebContent/adminHome.jsp
@@ -1,10 +1,10 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
- <%@page import="java.sql.*, java.lang.Integer,com.hit.beans.VendorBean,com.hit.utility.DBUtil,java.util.List,java.util.ArrayList,com.hit.dao.VendorDaoImpl,com.hit.dao.VendorDao, javax.servlet.annotation.WebServlet" errorPage="errorpage.jsp"%>
+ <%@page import="java.sql.*, com.hit.utility.DBUtil, javax.servlet.annotation.WebServlet" errorPage="errorpage.jsp"%>
-
+
@@ -19,77 +19,15 @@
-
-
<%
String user = (String)session.getAttribute("user");
String uname = (String)session.getAttribute("username");
String pword = (String)session.getAttribute("password");
- if(user==null || !user.equalsIgnoreCase("admin") || uname.equals("") || pword.equals("")){
+ if(!user.equalsIgnoreCase("admin") || uname.equals("") || pword.equals("")){
response.sendRedirect("loginFailed.jsp");
@@ -104,7 +42,7 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+ Admin Accountpagetitle id is given here
+ -->
+
-
-
-
-
-
- Hey Admin! Welcome to Our Tender Management system
- Here You can manage your vendors, add tenders and assign it to vendors according to their high bids
- Go on the about menu section links to explore the site
- You can also add notice,update it and delete the notice board from the database!
-
+
+ These are the Vendors Currently Registered With Us
+
+
+
+
+
+
+
+ | Vendor Id | Vendor Name | Mobile | Company | Address | |
| <%= vendor.getId() %> | <%= vendor.getName() %> | <%= vendor.getMobile() %> | +<%= vendor.getEmail() %> | <%= vendor.getCompany() %> | +
+
From 497b6b6a8013dfcfff0b19d4ead3967d7aeb1997 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:52:27 +0530
Subject: [PATCH 05/44] Update adminViewVendor.jsp
---
tendermanagement/WebContent/adminViewVendor.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tendermanagement/WebContent/adminViewVendor.jsp b/tendermanagement/WebContent/adminViewVendor.jsp
index affb53b..e89e00e 100644
--- a/tendermanagement/WebContent/adminViewVendor.jsp
+++ b/tendermanagement/WebContent/adminViewVendor.jsp
@@ -10,7 +10,7 @@
-
@@ -126,49 +64,22 @@
+
+
+
+
+
-
+
- -->
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
- These are the Vendors Currently Registered With Us
-
-
-
-
-
-
-
- | Vendor Id | Vendor Name | Mobile | Company | Address | |
| <%= vendor.getId() %> | <%= vendor.getName() %> | <%= vendor.getMobile() %> | -<%= vendor.getEmail() %> | <%= vendor.getCompany() %> | -
Hey Admin! Welcome to Our Tender Management system
+ Here You can manage your vendors, add tenders and assign it to vendors according to their high bids
+ Go on the about menu section links to explore the site
+ You can also add notice,update it and delete the notice board from the database!
+ - Recently - Approved Tenders + Assigned Tenders
@@ -55,4 +54,4 @@
-
\ No newline at end of file
+
From 2236092641cbbc73ee694a5a9e6494dd89b7c750 Mon Sep 17 00:00:00 2001
From: Khushi Sharma <96431469+khsh13@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:54:10 +0530
Subject: [PATCH 09/44] Update bidHistory.jsp
---
tendermanagement/WebContent/bidHistory.jsp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tendermanagement/WebContent/bidHistory.jsp b/tendermanagement/WebContent/bidHistory.jsp
index d529518..5124b58 100644
--- a/tendermanagement/WebContent/bidHistory.jsp
+++ b/tendermanagement/WebContent/bidHistory.jsp
@@ -6,13 +6,13 @@
-
+
-
-
+ style="color: white; background-color: #008036; margin-top: -15px; margin-bottom: 12px">
+
@@ -110,7 +110,7 @@
-->
| Application Id | Tender Id | Bid Amount | From 60b8f1b3914d987b896831e8aa3827703a15c1ec Mon Sep 17 00:00:00 2001 From: Khushi Sharma <96431469+khsh13@users.noreply.github.com> Date: Tue, 21 Nov 2023 08:54:31 +0530 Subject: [PATCH 10/44] Update bidTender.jsp --- tendermanagement/WebContent/bidTender.jsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tendermanagement/WebContent/bidTender.jsp b/tendermanagement/WebContent/bidTender.jsp index a677db2..5ac15d8 100644 --- a/tendermanagement/WebContent/bidTender.jsp +++ b/tendermanagement/WebContent/bidTender.jsp @@ -6,13 +6,13 @@ - + -
| Tender Id | Tender Name | Type | From 0d1d5fca19e57571bf20af7d2c46b7df571fc0e3 Mon Sep 17 00:00:00 2001 From: Khushi Sharma <96431469+khsh13@users.noreply.github.com> Date: Tue, 21 Nov 2023 08:54:46 +0530 Subject: [PATCH 11/44] Update bidTenderForm.jsp --- tendermanagement/WebContent/bidTenderForm.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tendermanagement/WebContent/bidTenderForm.jsp b/tendermanagement/WebContent/bidTenderForm.jsp index a62764f..d9b203d 100644 --- a/tendermanagement/WebContent/bidTenderForm.jsp +++ b/tendermanagement/WebContent/bidTenderForm.jsp @@ -10,7 +10,7 @@ -
- 
- 
- 
-