From: <th...@us...> - 2004-01-20 16:43:38
|
Update of /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv5145/apps/cpu/src/webapp/WEB-INF Modified Files: struts-config-vm.xml struts-config-wizard.xml Log Message: + Amend Layout to automatically insert page numbers when in a wizard. Index: struts-config-vm.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-vm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** struts-config-vm.xml 20 Jan 2004 14:52:30 -0000 1.6 --- struts-config-vm.xml 20 Jan 2004 16:43:34 -0000 1.7 *************** *** 57,88 **** </action> <!-- **** --> - <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> - <forward name="vmTitle" path="Page 1 of 2 - Search Issued Permits" /> - <!-- vmChoice: default --> - <!-- vmMenu: default --> - <!-- vmBody: default --> - <!-- vmLinkAction: default --> - <!-- vmReset: default --> - </action> - <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> - <forward name="vmTitle" path="Page 2 of 2 - Search Issued Permits" /> - <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> - <forward name="vmBody" path="/pages/permit/select-facility.vm" /> - <forward name="vmResult" path="/pages/select-result.vm" /> - <forward name="vmParam" path="facilityCode" /> - <forward name="vmLabel" path="Facility Name" /> - <forward name="vmStep" path="submit" /> - <forward name="vmActionAdd" path="/vm/unit/facility/Edit" /> - </action> - <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> - <forward name="vmTitle" path="Permit Search Result - (Main)" /> - <!-- vmMenu: default --> - <forward name="vmBody" path="/pages/permit/result.vm" /> - <!-- vmLinkAction:default --> - <!-- vmAction: default --> - <!-- vmReset: default --> - </action> <action path="/vm/main/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail" /> <forward name="vmChoice" path="View" /> <!-- vmMenu: default --> --- 57,62 ---- </action> <!-- **** --> <action path="/vm/main/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Main Area" /> <forward name="vmChoice" path="View" /> <!-- vmMenu: default --> *************** *** 92,114 **** </action> <!-- **** --> - <action path="/vm/staff/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Search All Permits (Staff)" /> - <forward name="vmMenu" path="/pages/menu/staff.vm" /> - <!-- vmBody: default --> - <forward name="vmLinkAction" path="/staff/permit/View.do" /> - <forward name="vmReset" path="/staff/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> - <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> - <forward name="vmTitle" path="Search Issued Permits and Pending Applications" /> - <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> - <forward name="vmBody" path="/pages/permit/select-facility.vm" /> - <forward name="vmResult" path="/pages/select-result.vm" /> - <forward name="vmParam" path="facilityCode" /> - <forward name="vmLabel" path="Facility Name" /> - <forward name="vmStep" path="submit" /> - </action> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Permit Search Result (Staff)" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> --- 66,71 ---- </action> <!-- **** --> <action path="/vm/staff/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Result- Search Issued and Pending Permits" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> <forward name="vmBody" path="/pages/permit/result.vm" /> *************** *** 119,123 **** </action> <action path="/vm/staff/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail (Staff)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> --- 76,80 ---- </action> <action path="/vm/staff/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Staff Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/staff.vm" /> *************** *** 128,132 **** <!-- **** --> <action path="/vm/unit/permit/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 85,89 ---- <!-- **** --> <action path="/vm/unit/permit/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 136,140 **** </action> <action path="/vm/unit/permit/EditExt" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmExtend,vmActionMain"> ! <forward name="vmTitle" path="Add/Edit Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 93,97 ---- </action> <action path="/vm/unit/permit/EditExt" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmExtend,vmActionMain"> ! <forward name="vmTitle" path="Add/Edit Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 149,153 **** </action> <action path="/vm/unit/permit/Store" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmActions"> ! <forward name="vmTitle" path="Permit Detail (Unit)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 106,110 ---- </action> <action path="/vm/unit/permit/Store" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmActions"> ! <forward name="vmTitle" path="Permit Detail - Unit Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 155,160 **** <forward name="vmActions" path="/pages/permit/viewUnit.vm" /> </action> <action path="/vm/unit/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmAction,vmActions,vmActionEdit,vmActionAdd,vmActionSearch,vmActionEditExt,vmActionMerge"> ! <forward name="vmTitle" path="Permit Detail (Unit)" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 112,128 ---- <forward name="vmActions" path="/pages/permit/viewUnit.vm" /> </action> + <action path="/vm/unit/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> + <forward name="vmTitle" path="Search Result - Issued and Pending Permits - Unit Area" /> + <forward name="vmChoice" path="Search Result" /> + <forward name="vmMenu" path="/pages/menu/unit.vm" /> + <forward name="vmBody" path="/pages/permit/result.vm" /> + <forward name="vmLinkAction" path="/unit/permit/View.do" /> + <forward name="vmAction" path="/unit/permit/search/Wizard" /> + <forward name="vmLinkAction" path="/unit/permit/View" /> + <forward name="vmReset" path="/unit/Main" /> + <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> + </action> <action path="/vm/unit/permit/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_select_id" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmAction,vmActions,vmActionEdit,vmActionAdd,vmActionSearch,vmActionEditExt,vmActionMerge"> ! <forward name="vmTitle" path="Permit Detail - Unit Area" /> <forward name="vmChoice" path="View" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 168,194 **** <forward name="vmActionMerge" path="/unit/permit/Merge" /> </action> - <action path="/vm/unit/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Search All Permits (Unit)" /> - <forward name="vmChoice" path="Search" /> - <forward name="vmMenu" path="/pages/menu/unit.vm" /> - <!-- vmBody: default --> - <forward name="vmLinkAction" path="/unit/permit/View.do" /> - <forward name="vmReset" path="/unit/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> - <action path="/vm/unit/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset,vmExtend"> - <forward name="vmTitle" path="Permit Search Result (Unit)" /> - <forward name="vmChoice" path="Search Result" /> - <forward name="vmMenu" path="/pages/menu/unit.vm" /> - <forward name="vmBody" path="/pages/permit/result.vm" /> - <forward name="vmLinkAction" path="/unit/permit/View.do" /> - <forward name="vmAction" path="/unit/permit/search/Wizard" /> - <forward name="vmLinkAction" path="/unit/permit/View" /> - <forward name="vmReset" path="/unit/Main" /> - <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> - </action> <!-- **** --> <action path="/vm/unit/track/User" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody"> ! <forward name="vmTitle" path="Your Tracking List (Unit)" /> <forward name="vmChoice" path="User" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 136,142 ---- <forward name="vmActionMerge" path="/unit/permit/Merge" /> </action> <!-- **** --> <action path="/vm/unit/track/User" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody"> ! <forward name="vmTitle" path="Your Tracking List - Unit Area" /> <forward name="vmChoice" path="User" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 197,201 **** <action path="/vm/unit/track/Result" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction"> <forward name="vmLayout" path="/pages/Printer.vm" /> ! <forward name="vmTitle" path="Master Tracking List (Unit)" /> <forward name="vmChoice" path="Track" /> <forward name="vmMenu" path="/pages/menu/printer.vm" /> --- 145,149 ---- <action path="/vm/unit/track/Result" type="us_ok_deq_wqdata.cpu.ViewAction" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction"> <forward name="vmLayout" path="/pages/Printer.vm" /> ! <forward name="vmTitle" path="Master Tracking List - Unit Area" /> <forward name="vmChoice" path="Track" /> <forward name="vmMenu" path="/pages/menu/printer.vm" /> *************** *** 205,209 **** <!-- **** --> <action path="/vm/unit/facility/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Facility (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 153,157 ---- <!-- **** --> <action path="/vm/unit/facility/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Facility - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 213,217 **** </action> <action path="/vm/unit/facility/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Facility (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 161,165 ---- </action> <action path="/vm/unit/facility/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Facility - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 224,228 **** </action> <action path="/vm/unit/facility/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Facility Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/view.vm" /> --- 172,176 ---- </action> <action path="/vm/unit/facility/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Facility Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/view.vm" /> *************** *** 233,237 **** </action> <action path="/vm/unit/facility/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Facility Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/result.vm" /> --- 181,185 ---- </action> <action path="/vm/unit/facility/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="facility_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Facility Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/facility/result.vm" /> *************** *** 242,246 **** <!-- **** --> <action path="/vm/unit/contact/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Contact (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 190,194 ---- <!-- **** --> <action path="/vm/unit/contact/Add" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmAction"> ! <forward name="vmTitle" path="Add Contact - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 250,254 **** </action> <action path="/vm/unit/contact/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Contact (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 198,202 ---- </action> <action path="/vm/unit/contact/Edit" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_store" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmAction,vmFormOpen,vmFormClose,vmAction,vmActionMain"> ! <forward name="vmTitle" path="Edit Contact - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 261,265 **** </action> <action path="/vm/unit/contact/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Contact Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/view.vm" /> --- 209,213 ---- </action> <action path="/vm/unit/contact/View" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_select_id" validate="false" parameter="vmTitle,vmMenu,vmBody,vmActions,vmActionAdd,vmActionEdit,vmActionSearch"> ! <forward name="vmTitle" path="Contact Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/view.vm" /> *************** *** 270,274 **** </action> <action path="/vm/unit/contact/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Contact Search Result (Unit)" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/result.vm" /> --- 218,222 ---- </action> <action path="/vm/unit/contact/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="contact_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> ! <forward name="vmTitle" path="Contact Search Result - Unit Area" /> <!-- vmMenu: default --> <forward name="vmBody" path="/pages/contact/result.vm" /> Index: struts-config-wizard.xml =================================================================== RCS file: /cvsroot/wqdata/wqdata4/apps/cpu/src/webapp/WEB-INF/struts-config-wizard.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** struts-config-wizard.xml 16 Jan 2004 19:38:42 -0000 1.8 --- struts-config-wizard.xml 20 Jan 2004 16:43:35 -0000 1.9 *************** *** 36,40 **** ! <!-- permit_search* --> <action path="/main/permit/search/Wizard" --- 36,40 ---- ! <!-- main: permit_search* --> <action path="/main/permit/search/Wizard" *************** *** 43,51 **** validate="false" parameter="2,vmAction"> ! <forward name="0,step" path="" /> <forward name="1,step" path="/vm/main/permit/Search.do" /> <forward name="2,step" path="/vm/main/permit/Search2.do" /> <forward name="3,submit" path="/main/permit/Search.do" redirect="true" /> </action> <action path="/staff/permit/search/Wizard" --- 43,80 ---- validate="false" parameter="2,vmAction"> ! <forward name="0,step" path="/Main.do" /> <forward name="1,step" path="/vm/main/permit/Search.do" /> <forward name="2,step" path="/vm/main/permit/Search2.do" /> <forward name="3,submit" path="/main/permit/Search.do" redirect="true" /> </action> + + <action path="/vm/main/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset"> + <forward name="vmTitle" path="Search Issued Permits" /> + <!-- vmChoice: default --> + <!-- vmMenu: default --> + <!-- vmBody: default --> + <!-- vmLinkAction: default --> + <!-- vmReset: default --> + </action> + <action path="/vm/main/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> + <forward name="vmTitle" path="Search Issued Permits" /> + <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> + <forward name="vmBody" path="/pages/permit/select-facility.vm" /> + <forward name="vmResult" path="/pages/select-result.vm" /> + <forward name="vmParam" path="facilityCode" /> + <forward name="vmLabel" path="Facility Name" /> + <forward name="vmStep" path="submit" /> + <forward name="vmActionAdd" path="/vm/unit/facility/Edit" /> + </action> + <action path="/vm/main/permit/Result" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search_issued" validate="false" parameter="vmTitle,vmMenu,vmBody,vmList,vmLinkAction,vmAction,vmReset"> + <forward name="vmTitle" path="Search Result- Search Issued Permits" /> + <!-- vmMenu: default --> + <forward name="vmBody" path="/pages/permit/result.vm" /> + <!-- vmLinkAction:default --> + <!-- vmAction: default --> + <!-- vmReset: default --> + </action> + + <!-- staff --> <action path="/staff/permit/search/Wizard" *************** *** 59,65 **** <forward name="3,submit" path="/staff/permit/Search.do" redirect="true" /> </action> ! <!-- permit_store_wizard --> <action path="/vm/unit/permit/store/p01_county" type="us_ok_deq_wqdata.cpu.ViewAction" --- 88,134 ---- <forward name="3,submit" path="/staff/permit/Search.do" redirect="true" /> </action> + <action path="/vm/staff/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> + <forward name="vmTitle" path="Search Issued and Pending Permits" /> + <forward name="vmMenu" path="/pages/menu/staff.vm" /> + <!-- vmBody: default --> + <forward name="vmLinkAction" path="/staff/permit/View.do" /> + <forward name="vmReset" path="/staff/Main" /> + <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> + </action> + <action path="/vm/staff/permit/Search2" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep"> + <forward name="vmTitle" path="Search Issued and Pending Permits" /> + <forward name="vmFormClose" path="/pages/form-wizard-done.vm" /> + <forward name="vmBody" path="/pages/permit/select-facility.vm" /> + <forward name="vmResult" path="/pages/select-result.vm" /> + <forward name="vmParam" path="facilityCode" /> + <forward name="vmLabel" path="Facility Name" /> + <forward name="vmStep" path="submit" /> + </action> + <!-- unit --> + <action + path="/unit/permit/search/Wizard" + type="org_apache_struts_actions.WizardAction" + name="permit_search" + validate="false" + parameter="2,vmAction"> + <forward name="0,step" path="/unit/permit/Main.do" /> + <forward name="1,step" path="/vm/unit/permit/Search.do" /> + <forward name="2,step" path="/vm/staff/permit/Search2.do" /> + <!-- sic --> + <forward name="3,submit" path="/unit/permit/Search.do" redirect="true" /> + </action> ! <action path="/vm/unit/permit/Search" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_search" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmReset,vmExtend"> ! <forward name="vmTitle" path="Search Issued and Pending Permits - Unit Area" /> ! <forward name="vmChoice" path="Search" /> ! <forward name="vmMenu" path="/pages/menu/unit.vm" /> ! <!-- vmBody: default --> ! <forward name="vmLinkAction" path="/unit/permit/View.do" /> ! <forward name="vmReset" path="/unit/Main" /> ! <forward name="vmExtend" path="/pages/permit/searchExt.vm" /> ! </action> ! ! <!-- permit: permit_store_wizard --> <action path="/vm/unit/permit/store/p01_county" type="us_ok_deq_wqdata.cpu.ViewAction" *************** *** 67,71 **** validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 136,141 ---- validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <!-- :FIXME: There should be a way to use runtime ${variables} --> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 76,80 **** </action> <action path="/vm/unit/permit/store/p02_applicant" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 146,150 ---- </action> <action path="/vm/unit/permit/store/p02_applicant" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 91,95 **** </action> <action path="/vm/unit/permit/store/p03_applicant_contact" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 161,165 ---- </action> <action path="/vm/unit/permit/store/p03_applicant_contact" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 106,110 **** </action> <action path="/vm/unit/permit/store/p04_fees" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 176,180 ---- </action> <action path="/vm/unit/permit/store/p04_fees" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 114,118 **** </action> <action path="/vm/unit/permit/store/p05_media_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 184,188 ---- </action> <action path="/vm/unit/permit/store/p05_media_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 122,126 **** </action> <action path="/vm/unit/permit/store/p06_plan_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 192,196 ---- </action> <action path="/vm/unit/permit/store/p06_plan_type" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 130,134 **** </action> <action path="/vm/unit/permit/store/p07_facility" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 200,204 ---- </action> <action path="/vm/unit/permit/store/p07_facility" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 143,147 **** </action> <action path="/vm/unit/permit/store/p08_consulting_engineer" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 213,217 ---- </action> <action path="/vm/unit/permit/store/p08_consulting_engineer" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmResult,vmParam,vmLabel,vmStep,vmActionAdd,vmParamAdd,vmParamAddValue"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 158,162 **** </action> <action path="/vm/unit/permit/store/p09_descriptions" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 228,232 ---- </action> <action path="/vm/unit/permit/store/p09_descriptions" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 166,170 **** </action> <action path="/vm/unit/permit/store/p10_numbers" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 236,240 ---- </action> <action path="/vm/unit/permit/store/p10_numbers" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar"> ! <forward name="vmTitle" path="Store Permit" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 174,178 **** </action> <action path="/vm/unit/permit/store/p11_dates" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmExtend"> ! <forward name="vmTitle" path="Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 244,248 ---- </action> <action path="/vm/unit/permit/store/p11_dates" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmFormOpen,vmFormClose,vmButtonBar,vmExtend"> ! <forward name="vmTitle" path="Store Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 183,187 **** </action> <action path="/vm/unit/permit/store/done" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmActions"> ! <forward name="vmTitle" path="Confirm - Store Permit (Unit)" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> --- 253,257 ---- </action> <action path="/vm/unit/permit/store/done" type="us_ok_deq_wqdata.cpu.ViewAction" name="permit_store_wizard" validate="false" parameter="vmTitle,vmChoice,vmMenu,vmBody,vmLinkAction,vmActions"> ! <forward name="vmTitle" path="Confirm - Store Permit - Unit Area" /> <forward name="vmChoice" path="Edit" /> <forward name="vmMenu" path="/pages/menu/unit.vm" /> *************** *** 214,230 **** </action> - <action - path="/unit/permit/search/Wizard" - type="org_apache_struts_actions.WizardAction" - name="permit_search" - validate="false" - parameter="2,vmAction"> - <forward name="0,step" path="/unit/permit/Main.do" /> - <forward name="1,step" path="/vm/unit/permit/Search.do" /> - <forward name="2,step" path="/vm/staff/permit/Search2.do" /> - <!-- sic --> - <forward name="3,submit" path="/unit/permit/Search.do" redirect="true" /> - </action> - </action-mappings> --- 284,287 ---- |