[Servsys-svn] SF.net SVN: servsys: [114] trunk/servsys
Brought to you by:
molnar_c
Menu
▾
▴
[Servsys-svn] SF.net SVN: servsys: [114] trunk/servsys
|
From: <mol...@us...> - 2006-05-23 17:35:40
|
Revision: 114 Author: molnar_c Date: 2006-05-23 10:35:00 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/servsys/?rev=114&view=rev Log Message: ----------- Needed to fix some bugs that I found during documentation for Meachams. Modified Paths: -------------- trunk/servsys/TODO trunk/servsys/src/com/pandmservices/UniPhoneList.java trunk/servsys/src/com/pandmservices/UniPreventative.java trunk/servsys/src/com/pandmservices/web/UniCash.java Modified: trunk/servsys/TODO =================================================================== --- trunk/servsys/TODO 2006-05-21 02:16:40 UTC (rev 113) +++ trunk/servsys/TODO 2006-05-23 17:35:00 UTC (rev 114) @@ -1,30 +1,33 @@ - Need to figure out a way for master worksheets to update when pricing updates. 55. Identify email of callslips into system - 54. Read email from server - -136. Load calc entry form - -137. Load calc edit form - -138. Load calc report - 145. Add prompting for package selection - 146. Add color prompting for package selection - - Upload checkme - move all select statements into other classes and out of UniCash.java. - if running on master server allow update of server dates. -- Add customer interface: customer selects on "request service" from main screen prior to log in. - is prompted for customer number from bill. customer number is searched to match address and phone number. - customer is presented with a pre-filled form or requested for information. Customer is asked to complete - information and aknowladge billing and disclaimer. Customer is given a reciept and email is sent to the - appropriate people. +- Edit Planned Service Pricing need to be added/fixed. +- Need to add CSV file import for Inventory Data +================================================================= +RELEASE 2.30 +================================================================= + ================================================================= RELEASE 2.29 ================================================================= (N) Moved from localhost cvs to svn.sourceforge.net /svnroot/servsys re-imported and updated. This is test commit. (N) Customer request form is now added +(F) Fixed the return from adding a service proposal to go to the correct spot on the servsys grid. +(N) Add customer interface: customer selects on "request service" from main screen prior to log in. + is prompted for customer number from bill. customer number is searched to match address and phone number. + customer is presented with a pre-filled form or requested for information. Customer is asked to complete + information and aknowladge billing and disclaimer. Customer is given a reciept and email is sent to the + appropriate people. +(F) Fixed the add planned service price routine. Error found while working on documentation. - - ================================================================= RELEASE 2.28 ================================================================= @@ -62,6 +65,9 @@ (N) Now added SyncCustQuotes (N) Now added SyncCustWorksheet (N) Now Added SyncCustPagreement +136. Load calc entry form +137. Load calc edit form - +138. Load calc report - ================================================================= RELEASE 2.25 Modified: trunk/servsys/src/com/pandmservices/UniPhoneList.java =================================================================== --- trunk/servsys/src/com/pandmservices/UniPhoneList.java 2006-05-21 02:16:40 UTC (rev 113) +++ trunk/servsys/src/com/pandmservices/UniPhoneList.java 2006-05-23 17:35:00 UTC (rev 114) @@ -80,13 +80,13 @@ } - public static void UpdateItem(Connection con, int record_number, String name, String home_number, String cell_number, String direct_connect, String truck_number, String additional_number) + public static void UpdateItem(Connection con, int record_number, String name, String home_number, String cell_number, String direct_connect, String truck_number, String additional_number, String newdate) throws SQLException { Statement stmt = con.createStatement(); stmt.executeUpdate("Update phone_list Set name ='" +name + "', home_number='"+home_number +"', cell_number='"+cell_number +"', direct_connect='"+direct_connect +"', truck_number='"+truck_number +"', additional_number='"+additional_number +"' Where record_number=" + record_number + ";"); + stmt.executeUpdate("update phone_list_date set dateupdated='"+newdate+"';"); } - public static void AddItem(Connection con, String name, String home_number, String cell_number, String direct_connect, String truck_number, String additional_number) throws SQLException, NoSuchAlgorithmException, NoSuchProviderException { @@ -94,6 +94,14 @@ stmt.executeUpdate("INSERT INTO phone_list (name, home_number, cell_number, direct_connect, truck_number, additional_number) Values ('" + name + "','" +home_number+ "','"+ cell_number+ "','"+ direct_connect + "','" + truck_number + "','"+ additional_number + "')"); } + public static void AddItem(Connection con, String name, String home_number, String cell_number, String direct_connect, String truck_number, String additional_number, String newdate) + throws SQLException, NoSuchAlgorithmException, NoSuchProviderException + { + Statement stmt = con.createStatement(); + stmt.executeUpdate("INSERT INTO phone_list (name, home_number, cell_number, direct_connect, truck_number, additional_number) Values ('" + name + "','" +home_number+ "','"+ cell_number+ "','"+ direct_connect + "','" + truck_number + "','"+ additional_number + "')"); + stmt.executeUpdate("update phone_list_date set dateupdated='"+newdate+"';"); + } + public int getId() { return record_number; } public String getName() { return name; } Modified: trunk/servsys/src/com/pandmservices/UniPreventative.java =================================================================== --- trunk/servsys/src/com/pandmservices/UniPreventative.java 2006-05-21 02:16:40 UTC (rev 113) +++ trunk/servsys/src/com/pandmservices/UniPreventative.java 2006-05-23 17:35:00 UTC (rev 114) @@ -69,7 +69,16 @@ Statement stmt = con.createStatement(); stmt.executeUpdate("Update todo Set descript='" +desc+ "' Where ID=" + id + ";"); } - + +public static void addPreventative(Connection con, String description, String tm_est, String yr_1, String yr_2, String yr_3, String newdate) + throws SQLException + { + String tdescription = description.replaceAll("'","''"); + Statement stmt = con.createStatement(); + stmt.executeUpdate("INSERT INTO prevprices (descript, tm_est, yr1, yr2, yr3) Values ('" + tdescription + "','" +tm_est+ "','"+ yr_1 + "','"+ yr_2 + "','"+ yr_3 + "')"); + stmt.executeUpdate("update prevprices_date set dateupdated='"+newdate+"';"); + } + public static void addPreventative(Connection con, String description, String tm_est, String yr_1, String yr_2, String yr_3) throws SQLException { Modified: trunk/servsys/src/com/pandmservices/web/UniCash.java =================================================================== --- trunk/servsys/src/com/pandmservices/web/UniCash.java 2006-05-21 02:16:40 UTC (rev 113) +++ trunk/servsys/src/com/pandmservices/web/UniCash.java 2006-05-23 17:35:00 UTC (rev 114) @@ -4823,7 +4823,7 @@ out.println("</td><td>"); out.println("<input type=\"text\" name=\"lname\" size=\"20\" >"); out.println("</td></tr><tr><td>"); - out.println("First Name:"); + out.println("First Name:<br>(Leave blank if business)"); out.println("</td><td>"); out.println("<input type=\"text\" name=\"fname\" size=\"20\" >"); out.println("</td></tr><tr><td>"); @@ -4881,7 +4881,7 @@ out.println("</P>"); out.println("</TD>"); out.println("<TD WIDTH=50% ALIGN=LEFT>"); - out.println("<h2><i>Service Entry and Reporting System</i></h2>"); + //out.println("<h2><i>Service Entry and Reporting System</i></h2>"); out.println("</TD>"); out.println("</TR>"); out.println("</THEAD>"); @@ -4890,13 +4890,13 @@ out.println("</HTML>"); out.println("<br><br><br><br><CENTER>"); out.println("(C) Copyright 2002-2006 - Our World Services, LLC<br>"); -out.println("<br>Version: "+doVersionInfo_VNumber()+" - Compiled: "+doFormatDate(getDate(doVersionInfo_VDate()))+"<br>"); +//out.println("<br>Version: "+doVersionInfo_VNumber()+" - Compiled: "+doFormatDate(getDate(doVersionInfo_VDate()))+"<br>"); //out.println("<br>Software Expire Date: "+doFormatDate(getDate(doGetExpireDate()))+"<br>"); //out.println("<br>Software Expire Date has been removed for GPL version.<br>"); //out.println("<br>Source code per the GPL can be found on sourceforge.net or at servsys.org<br>"); out.println("<br><br><br>For assistance with this product please contact:<br>Chris Molnar<br>860-798-7032<br>mo...@ma..."); -out.println("<br><br><br><P><IMG SRC=\""+Gwebhome+"MacOS_Pnthr_Vert_v1.gif\" NAME=\"Graphic1\" ALIGN=CENTER WIDTH=50 HEIGHT=60 BORDER=0><BR CLEAR=LEFT><BR>"); -out.println("Developed on Mac OS/X for all platforms<br>"); +//out.println("<br><br><br><P><IMG SRC=\""+Gwebhome+"MacOS_Pnthr_Vert_v1.gif\" NAME=\"Graphic1\" ALIGN=CENTER WIDTH=50 HEIGHT=60 BORDER=0><BR CLEAR=LEFT><BR>"); +//out.println("Developed on Mac OS/X for all platforms<br>"); /* #system("uptime"); */ out.println("</CENTER>"); @@ -5213,6 +5213,8 @@ mbody=combinestring(mbody,"Customer Name: "+cname+"<br>"); mbody=combinestring(mbody,"Address: "+address1+"<br>"); mbody=combinestring(mbody,"Address: "+address2+"<br>"); + mbody=combinestring(mbody,"Phone: "+homephone+"<br>"); + mbody=combinestring(mbody,"Phone 2: "+altphone+"<br>"); mbody=combinestring(mbody,"City, State Zip:"+city+", "+state+" "+zip+"<br>"); mbody=combinestring(mbody,"<br>"); mbody=combinestring(mbody,"Date:"+cdate+"<br>"); @@ -10260,7 +10262,7 @@ out.println("<head>"); out.println("<title>Add Preventative Price</title>"); out.println("</head>"); - out.println("<form method=\"post\" action=\"href="+classdir+"UniCash?action=saveprevprice\" name=\"addcust\">"); + out.println("<form method=\"post\" action=\""+classdir+"UniCash?action=saveprevprice\" name=\"addcust\">"); out.println("<p>Description :"); out.println("<input type=\"text\" name=\"descript\" size=\"40\">"); out.println("</p>"); @@ -10280,8 +10282,7 @@ out.println("<INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"Save\">"); out.println("<INPUT TYPE=\"reset\">"); out.println("</CENTER>"); - - con.close(); + con.close(); } private void doSavePrevPrice(HttpServletRequest req, HttpServletResponse res, PrintWriter out, HttpSession session, String username) @@ -10292,9 +10293,15 @@ String yr2 = req.getParameter("yr2"); String yr1 = req.getParameter("yr1"); String tm_est = req.getParameter("tm_est"); + Format formatter; + Calendar now = Calendar.getInstance(); + Date date = new Date(); + formatter = new SimpleDateFormat("yyyy-MM-dd"); + String s = formatter.format(date); - UniPreventative.addPreventative(con, descript, tm_est, yr1, yr2, yr3); + UniPreventative.addPreventative(con, descript, tm_est, yr1, yr2, yr3, s); out.println("Your item has been added to the database<br>"); + con.close(); res.sendRedirect(""+classdir+"UniCash?action=listprevprice"); } @@ -10367,11 +10374,11 @@ out.println("<title>Planned Service Prices</title>"); out.println("</head>"); out.println("<BODY TEXT=#000000 LINK=#0000ff VLINK=#000080 BGCOLOR=#ffffff> "); -out.println("<a href="+classdir+"UniCash?action=addprevetative>Add a Service Price</a>"); +out.println("<a href="+classdir+"UniCash?action=addprevprice>Add a Service Plan Price</a>"); out.println("<P><P>"); out.println("<table border=1 width=100%>"); -//out.println("<th>Description</th><th>T/M Cost</th><th>1 Year</th><th>2 Year</th><th>3 Year</th>"); -out.println("<th>Description</th><th>T/M Cost</th><th>2 Year</th><th>3 Year</th>"); +out.println("<th>Description</th><th>T/M Cost</th><th>1 Year</th><th>2 Year</th><th>3 Year</th>"); +//out.println("<th>Description</th><th>T/M Cost</th><th>2 Year</th><th>3 Year</th>"); Vector v; v = UniPreventative.getAllItems(con); int counter=0; @@ -10395,12 +10402,11 @@ counter=0; } -//out.println("<tr><td><a href=edprevprice.php?planrec="+planrec+">"+description+"</a></td><td>"+tm_est+"</td><td>"+yr_1+"</td><td>"+yr_2+"</td><td>"+yr_3+"</td></tr>"); - out.println("<tr><td><a href=edprevprice.php?planrec="+planrec+">"+description+"</a></td><td>"+tm_est+"</td><td>"+yr_2+"</td><td>"+yr_3+"</td></tr>"); +out.println("<tr><td><a href=edprevprice.php?planrec="+planrec+">"+description+"</a></td><td>"+tm_est+"</td><td>"+yr_1+"</td><td>"+yr_2+"</td><td>"+yr_3+"</td></tr>"); + //out.println("<tr><td><a href=edprevprice.php?planrec="+planrec+">"+description+"</a></td><td>"+tm_est+"</td><td>"+yr_2+"</td><td>"+yr_3+"</td></tr>"); } out.println("</table>"); -out.println("<P><P>"); -out.println("<a href="+classdir+"UniCash?action=addprevetative>Add a Service Price</a>"); +out.println("<P><P>");out.println("<a href="+classdir+"UniCash?action=addprevprice>Add a Service Plan Price</a>"); con.close(); } @@ -21235,7 +21241,13 @@ String dirconnect = req.getParameter("dirconnect"); String trucknum = req.getParameter("trucknum"); String addnum = req.getParameter("addnum"); - UniPhoneList.UpdateItem(con, recnum, ename, homenum, cellnum, dirconnect, trucknum, addnum); + Format formatter; + Calendar now = Calendar.getInstance(); + Date date = new Date(); + formatter = new SimpleDateFormat("yyyy-MM-dd"); + String s = formatter.format(date); + + UniPhoneList.UpdateItem(con, recnum, ename, homenum, cellnum, dirconnect, trucknum, addnum, s); con.close(); res.sendRedirect(""+classdir+"UniCash?action=listphonelist"); } @@ -21250,7 +21262,13 @@ String dirconnect = req.getParameter("dirconnect"); String trucknum = req.getParameter("trucknum"); String addnum = req.getParameter("addnum"); - UniPhoneList.AddItem(con, ename, homenum, cellnum, dirconnect, trucknum, addnum); + Format formatter; + Calendar now = Calendar.getInstance(); + Date date = new Date(); + formatter = new SimpleDateFormat("yyyy-MM-dd"); + String s = formatter.format(date); + + UniPhoneList.AddItem(con, ename, homenum, cellnum, dirconnect, trucknum, addnum, s); con.close(); res.sendRedirect(""+classdir+"UniCash?action=listphonelist"); } @@ -22357,7 +22375,7 @@ con.close(); out.println("Your item has been updated in the database<br>"); - res.sendRedirect(""+classdir+"UniCash?action=showcustdetail&csection=6&custnum="+custnum+"&custstart="+custstart+"&custstop="+custstop+""); + res.sendRedirect(""+classdir+"UniCash?action=showcustdetail&csection=5&custnum="+custnum+"&custstart="+custstart+"&custstop="+custstop+""); } private void doSavePrev(HttpServletRequest req, HttpServletResponse res, PrintWriter out, HttpSession session, String username) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
