[Oscarmcmaster-cvscommit] oscar_mcmaster/web/admin admincontrol.jsp, 1.16, 1.16.4.1

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21365/web/admin

Modified Files:
      Tag: CAISI_TORONTO_RFQ_20070828_B
	admincontrol.jsp 
Log Message:


Index: admincontrol.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admincontrol.jsp,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -d -r1.16 -r1.16.4.1
*** admincontrol.jsp	18 Jun 2007 20:38:11 -0000	1.16
--- admincontrol.jsp	10 Sep 2007 01:26:51 -0000	1.16.4.1
***************
*** 44,54 ****
  
  <%
!   String orderby="", limit="", limit1="", limit2="";
    if(request.getParameter("orderby")!=null) orderby="order by "+request.getParameter("orderby");
-   if(request.getParameter("limit1")!=null) limit1=request.getParameter("limit1");
-   if(request.getParameter("limit2")!=null) {
-     limit2=request.getParameter("limit2");
-     limit="limit "+limit2 + " offset "+limit1;
-   }
  
    String fieldname="", regularexp="like"; // exactly search is not required by users, e.g. regularexp="=";
--- 44,49 ----
  
  <%
!   String orderby="";
    if(request.getParameter("orderby")!=null) orderby="order by "+request.getParameter("orderby");
  
    String fieldname="", regularexp="like"; // exactly search is not required by users, e.g. regularexp="=";
***************
*** 105,114 ****
    dbQueries=new String[][] {
      {"provider_add_record", "insert into provider (provider_no,last_name,first_name,provider_type,specialty,team,sex,dob,address,phone,work_phone,ohip_no,rma_no,billing_no,hso_no,status,comments,provider_activity) values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?, ?)" },
!     {"provider_search_titlename", "select provider_no,first_name,last_name,specialty,sex,team,phone,status from provider where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"provider_search_detail", "select * from provider where provider_no=?"},
      {"provider_delete", "delete from provider where provider_no=? and provider_no!='super'"},
      {"provider_update_record", "update provider set last_name=?,first_name=?, provider_type=?, specialty=?,team=?,sex =?,dob=?, address=?,phone=?,work_phone=?,ohip_no =?,rma_no=?,billing_no=?,hso_no=?,status=?, comments=?, provider_activity = ? where provider_no=? and provider_no!='super'"},
      
!     {"demographic_search_titlename", "select demographic_no,first_name,last_name,roster_status,sex,year_of_birth,month_of_birth,date_of_birth  from demographic where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"demographic_search_detail", "select * from demographic where demographic_no=?"},
      {"demographic_update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
--- 100,109 ----
    dbQueries=new String[][] {
      {"provider_add_record", "insert into provider (provider_no,last_name,first_name,provider_type,specialty,team,sex,dob,address,phone,work_phone,ohip_no,rma_no,billing_no,hso_no,status,comments,provider_activity) values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?, ?)" },
!     {"provider_search_titlename", "select provider_no,first_name,last_name,specialty,sex,team,phone,status from provider where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"provider_search_detail", "select * from provider where provider_no=?"},
      {"provider_delete", "delete from provider where provider_no=? and provider_no!='super'"},
      {"provider_update_record", "update provider set last_name=?,first_name=?, provider_type=?, specialty=?,team=?,sex =?,dob=?, address=?,phone=?,work_phone=?,ohip_no =?,rma_no=?,billing_no=?,hso_no=?,status=?, comments=?, provider_activity = ? where provider_no=? and provider_no!='super'"},
      
!     {"demographic_search_titlename", "select demographic_no,first_name,last_name,roster_status,sex,year_of_birth,month_of_birth,date_of_birth  from demographic where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"demographic_search_detail", "select * from demographic where demographic_no=?"},
      {"demographic_update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
***************
*** 121,125 ****
      
      {"security_add_record", "insert into security (user_name,password,provider_no,pin,b_ExpireSet,date_ExpireDate,b_LocalLockSet,b_RemoteLockSet) values(?,?,?,?,?,?,?,?)" },
!     {"security_search_titlename", "select * from security where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"security_search_detail", "select * from security where security_no=?"},
      {"security_delete", "delete from security where security_no=? and provider_no!='super'"},
--- 116,120 ----
      
      {"security_add_record", "insert into security (user_name,password,provider_no,pin,b_ExpireSet,date_ExpireDate,b_LocalLockSet,b_RemoteLockSet) values(?,?,?,?,?,?,?,?)" },
!     {"security_search_titlename", "select * from security where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"security_search_detail", "select * from security where security_no=?"},
      {"security_delete", "delete from security where security_no=? and provider_no!='super'"},
***************
*** 127,131 ****
      
      {"preference_add_record", "insert into preference (provider_no,start_hour,end_hour,every_min,mygroup_no,default_servicetype,color_template,new_tickler_warning_window) values(?,?,?,?,?,?,?,?)" },
!     {"preference_search_titlename", "select * from preference where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"preference_search_detail", "select * from preference where preference_no=?"},
      {"preference_list_servicetype", "select distinct servicetype, servicetype_name from ctl_billingservice where status='A'"},
--- 122,126 ----
      
      {"preference_add_record", "insert into preference (provider_no,start_hour,end_hour,every_min,mygroup_no,default_servicetype,color_template,new_tickler_warning_window) values(?,?,?,?,?,?,?,?)" },
!     {"preference_search_titlename", "select * from preference where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"preference_search_detail", "select * from preference where preference_no=?"},
      {"preference_list_servicetype", "select distinct servicetype, servicetype_name from ctl_billingservice where status='A'"},
***************
*** 146,155 ****
  	dbQueries=new String[][] {
      {"provider_add_record", "insert into provider (provider_no,last_name,first_name,provider_type,specialty,team,sex,dob,address,phone,work_phone,ohip_no,rma_no,billing_no,hso_no,status,comments,provider_activity) values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?, ?)" },
!     {"provider_search_titlename", "select provider_no,first_name,last_name,specialty,sex,team,phone,status from provider where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"provider_search_detail", "select * from provider where provider_no=?"},
      {"provider_delete", "delete from provider where provider_no=? and provider_no!='super'"},
      {"provider_update_record", "update provider set last_name=?,first_name=?, provider_type=?, specialty=?,team=?,sex =?,dob=?, address=?,phone=?,work_phone=?,ohip_no =?,rma_no=?,billing_no=?,hso_no=?,status=?, comments=?, provider_activity = ? where provider_no=? and provider_no!='super'"},
      
!     {"demographic_search_titlename", "select demographic_no,first_name,last_name,roster_status,sex,year_of_birth,month_of_birth,date_of_birth  from demographic where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"demographic_search_detail", "select * from demographic where demographic_no=?"},
      {"demographic_update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
--- 141,150 ----
  	dbQueries=new String[][] {
      {"provider_add_record", "insert into provider (provider_no,last_name,first_name,provider_type,specialty,team,sex,dob,address,phone,work_phone,ohip_no,rma_no,billing_no,hso_no,status,comments,provider_activity) values(?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?, ?)" },
!     {"provider_search_titlename", "select provider_no,first_name,last_name,specialty,sex,team,phone,status from provider where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"provider_search_detail", "select * from provider where provider_no=?"},
      {"provider_delete", "delete from provider where provider_no=? and provider_no!='super'"},
      {"provider_update_record", "update provider set last_name=?,first_name=?, provider_type=?, specialty=?,team=?,sex =?,dob=?, address=?,phone=?,work_phone=?,ohip_no =?,rma_no=?,billing_no=?,hso_no=?,status=?, comments=?, provider_activity = ? where provider_no=? and provider_no!='super'"},
      
!     {"demographic_search_titlename", "select demographic_no,first_name,last_name,roster_status,sex,year_of_birth,month_of_birth,date_of_birth  from demographic where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"demographic_search_detail", "select * from demographic where demographic_no=?"},
      {"demographic_update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
***************
*** 162,166 ****
      
      {"security_add_record", "insert into security (user_name,password,provider_no,pin,b_ExpireSet,date_ExpireDate,b_LocalLockSet,b_RemoteLockSet) values(?,?,?,?,?,?,?,?)" },
!     {"security_search_titlename", "select * from security where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"security_search_detail", "select * from security where security_no=?"},
      {"security_delete", "delete from security where security_no=? and provider_no!='super'"},
--- 157,161 ----
      
      {"security_add_record", "insert into security (user_name,password,provider_no,pin,b_ExpireSet,date_ExpireDate,b_LocalLockSet,b_RemoteLockSet) values(?,?,?,?,?,?,?,?)" },
!     {"security_search_titlename", "select * from security where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"security_search_detail", "select * from security where security_no=?"},
      {"security_delete", "delete from security where security_no=? and provider_no!='super'"},
***************
*** 168,172 ****
      
      {"preference_add_record", "insert into preference (provider_no,start_hour,end_hour,every_min,mygroup_no,default_servicetype,color_template) values(?,?,?,?,?,?,?)" },
!     {"preference_search_titlename", "select * from preference where "+fieldname+ " "+regularexp+" ? " +orderby + " "+limit},
      {"preference_search_detail", "select * from preference where preference_no=?"},
      {"preference_list_servicetype", "select distinct servicetype, servicetype_name from ctl_billingservice where status='A'"},
--- 163,167 ----
      
      {"preference_add_record", "insert into preference (provider_no,start_hour,end_hour,every_min,mygroup_no,default_servicetype,color_template) values(?,?,?,?,?,?,?)" },
!     {"preference_search_titlename", "select * from preference where "+fieldname+ " "+regularexp+" ? " +orderby},
      {"preference_search_detail", "select * from preference where preference_no=?"},
      {"preference_list_servicetype", "select distinct servicetype, servicetype_name from ctl_billingservice where status='A'"},