svn commit: r1176710 - in /ofbiz/trunk/applications/huma
Locked
svn commit: r1176710 - in /ofbiz/trunk/applications/huma
 
|
Author: hansbak
Date: Wed Sep 28 04:05:25 2011 New Revision: 1176710 URL: http://svn.apache.org/viewvc?rev=1176710&view=rev Log: remove duplicated screens, now the tree is pointing to the existing screens to add leaves Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml Wed Sep 28 04:05:25 2011 @@ -48,12 +48,9 @@ <field-map field-name="partyIdFrom" from-field="parameters.parentpartyId"/> </entity-and> <if-not-empty field="partyRelationship"> - <set field="fromDate" from-field="partyRelationship[0].fromDate"/> + <set-service-fields service-name="deletePartyRelationship" map="partyRelationship[0]" to-map="deletePartyRelationship"/> </if-not-empty> - <set field="orgRelCtx.partyIdTo" from-field="parameters.partyId"/> - <set field="orgRelCtx.partyIdFrom" from-field="parameters.parentpartyId"/> - <set field="orgRelCtx.fromDate" from-field="fromDate"/> - <call-service service-name="deletePartyRelationship" in-map-name="orgRelCtx"></call-service> + <call-service service-name="deletePartyRelationship" in-map-name="deletePartyRelationship"></call-service> </simple-method> <!-- Public Holiday --> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Wed Sep 28 04:05:25 2011 @@ -1065,49 +1065,20 @@ under the License. <response name="success" type="view" value="main"/> <response name="error" type="view" value="main"/> </request-map> - <request-map uri="removeEmlpPosition"> - <security https="true" auth="true"/> - <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeEmlpPosition"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="removeInternalOrg"> <security https="true" auth="true"/> <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeInternalOrg"/> <response name="success" type="view" value="main"/> <response name="error" type="view" value="main"/> </request-map> - <request-map uri="EditEmlPositionFtl"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditEmlPositionFtl"/> - </request-map> <request-map uri="EditInternalOrgFtl"> <security https="true" auth="true"/> <response name="success" type="view" value="EditInternalOrgFtl"/> </request-map> - <request-map uri="RemoveEmlPositionFtl"> - <security https="true" auth="true"/> - <response name="success" type="view" value="RemoveEmlPositionFtl"/> - </request-map> <request-map uri="RemoveInternalOrgFtl"> <security https="true" auth="true"/> <response name="success" type="view" value="RemoveInternalOrgFtl"/> </request-map> - <request-map uri="EditPerson"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPerson"/> - </request-map> - <request-map uri="createEmplPositionFtl"> - <security https="true" auth="true"/> - <event type="service" invoke="createEmplPosition"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="EditEmplPosition"/> - </request-map> - <request-map uri="createEmplPositionFulfillmentFtl"> - <security https="true" auth="true"/> - <event type="service" invoke="createEmplPositionFulfillment"/> - <response name="success" type="view" value="main"/> - </request-map> <request-map uri="PublicHoliday"> <security https="true" auth="true"/> <response name="success" type="view" value="PublicHoliday"/> @@ -1241,11 +1212,8 @@ under the License. <view-map name="EditEmplLeaveReasonTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplLeaveReasonTypes"/> <view-map name="FindLeaveApprovals" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#FindLeaveApprovals"/> <view-map name="EditEmplLeaveStatus" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#EditEmplLeaveStatus"/> - <view-map name="EditEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFtl"/> <view-map name="EditInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgFtl"/> - <view-map name="RemoveEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveEmlPositionFtl"/> <view-map name="RemoveInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveInternalOrgFtl"/> - <view-map name="EditPerson" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditPerson"/> <!-- ==================Recruitment View Map===================== --> <view-map name="FindJobRequisitions" type="screen" page="component://humanres/widget/RecruitmentScreens.xml#FindJobRequisitions"/> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl Wed Sep 28 04:05:25 2011 @@ -137,13 +137,13 @@ var rawdata = [ dataSet = {"partyId" : NODE.attr("id")}; jQuery.ajax({ type: "GET", - url: "EditEmlPositionFtl", + url: "EditEmplPosition", data: dataSet, error: function(msg) { alert("An error occured loading content! : " + msg); }, success: function(msg) { - jQuery('#dialog').html(msg); + jQuery('div.page-container').html(msg); } }); } @@ -188,23 +188,23 @@ var rawdata = [ if(node.attr('rel')=='N'){ var items = { AddPerson: { - label: "Add Person", - action: function (NODE, TREE_OBJ) { - var dataSet = {}; - dataSet = {"emplPositionId" : NODE.attr("id")}; - jQuery.ajax({ - type: "GET", - url: "EditPerson", - data: dataSet, - error: function(msg) { - alert("An error occured loading content! : " + msg); - }, - success: function(msg) { - jQuery('#dialog').html(msg); - } - }); - } - } + label: "Add Person", + action: function (NODE, TREE_OBJ) { + var dataSet = {}; + dataSet = {"emplPositionId" : NODE.attr("id")}; + jQuery.ajax({ + type: "GET", + url: "EditEmplPositionFulfillments", + data: dataSet, + error: function(msg) { + alert("An error occured loading content! : " + msg); + }, + success: function(msg) { + jQuery('div.page-container').html(msg); + } + }); + } + } } } Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl Wed Sep 28 04:05:25 2011 @@ -24,31 +24,4 @@ under the License. </script> <div id="emplposition" title="Add Employee Position"> ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionOnlyForm")} -</div> -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<script type="text/javascript"> - $("#dialog").dialog('open'); - $(function() { - $( "#emplposition" ).dialog({ autoOpen: true, width: 450}); - }); -</script> -<div id="emplposition" title="Add Employee Position"> - ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionOnlyForm")} </div> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl Wed Sep 28 04:05:25 2011 @@ -24,31 +24,4 @@ under the License. </script> <div id="rmvemplposition" title="Remove Employee Position"> ${screens.render("component://humanres/widget/EmplPositionScreens.xml#RemoveEmplPositionOnlyForm")} -</div> -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<script type="text/javascript"> - $("#dialog").dialog('open'); - $(function() { - $( "#rmvemplposition" ).dialog({ autoOpen: true, width: 900}); - }); -</script> -<div id="rmvemplposition" title="Remove Employee Position"> - ${screens.render("component://humanres/widget/EmplPositionScreens.xml#RemoveEmplPositionOnlyForm")} </div> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl Wed Sep 28 04:05:25 2011 @@ -24,31 +24,4 @@ under the License. </script> <div id="internalOrg" title="Add Internal Organization"> ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgOnlyForm")} -</div> -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<script type="text/javascript"> - $("#dialog").dialog('open'); - $(function() { - $( "#internalOrg" ).dialog({ autoOpen: true, width: 350}); - }); -</script> -<div id="internalOrg" title="Add Internal Organization"> - ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgOnlyForm")} </div> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl Wed Sep 28 04:05:25 2011 @@ -34,41 +34,4 @@ under the License. <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/> <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId?if_exists}"/> </form> -</div> -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<#assign partyGroup = delegator.findOne("PartyGroup", {"partyId" : parameters.partyId?if_exists}, true)/> -<#if partyGroup?has_content> - <#assign partyname = partyGroup.groupName?if_exists/> -</#if> -<script type="text/javascript"> - <!-- - var answer = confirm ("Are you sure you want to remove '<#if partyname?exists>${partyname}<#else>${parameters.partyId?if_exists}</#if>'?") - if (answer) - document.removeInternalOrg.submit(); - else - window.close(); - // --> -</script> -<div id="rmvinternalorg" title="Remove Internal Organization"> - <form name="removeInternalOrg" method="post" action="<@ofbizUrl>removeInternalOrg</@ofbizUrl>"> - <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/> - <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId?if_exists}"/> - </form> </div> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Wed Sep 28 04:05:25 2011 @@ -301,28 +301,6 @@ </widgets> </section> </screen> - <screen name="EditEmplPositionFtl"> - <section> - <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl"/></html></platform-specific> - </widgets> - </section> - </screen> - <screen name="EditEmplPositionOnlyForm"> - <section> - <actions> - <set field="titleProperty" value="PageTitleEditEmplPosition"/> - <set field="tabButtonItem" value="EditEmplPosition"/> - <set field="emplPositionId" from-field="parameters.emplPositionId"/> - <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-one entity-name="EmplPosition" value-field="emplPosition"/> - </actions> - <widgets> - <include-form name="EditEmplPositionFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> - </widgets> - </section> - </screen> <screen name="EditInternalOrgFtl"> <section> <actions> @@ -345,27 +323,6 @@ </widgets> </section> </screen> - <screen name="RemoveEmlPositionFtl"> - <section> - <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl"/></html></platform-specific> - </widgets> - </section> - </screen> - <screen name="RemoveEmplPositionOnlyForm"> - <section> - <actions> - <set field="titleProperty" value="PageTitleRemoveEmplPosition"/> - <set field="tabButtonItem" value="RemoveEmplPosition"/> - <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <entity-one entity-name="EmplPosition" value-field="emplPosition"/> - </actions> - <widgets> - <include-form name="ListEmplPositionsFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> - </widgets> - </section> - </screen> <screen name="RemoveInternalOrgFtl"> <section> <widgets> @@ -373,28 +330,4 @@ </widgets> </section> </screen> - <screen name="EditEmplPositionFulfillmentsFtl"> - <section> - <actions> - <set field="titleProperty" value="PageTitleListEmplPositionFulfillments"/> - <set field="tabButtonItem" value="EditEmplPositionFulfillments"/> - <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="emplPositionId" from-field="parameters.emplPositionId"/> - </actions> - <widgets> - <screenlet id="AddEmplPositionFulfillmentPanel"> - <include-form name="AddEmplPositionFulfillmentFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> - </screenlet> - </widgets> - </section> - </screen> - <screen name="EditPerson"> - <section> - <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editperson.ftl"/></html></platform-specific> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1176710&r1=1176709&r2=1176710&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Wed Sep 28 04:05:25 2011 @@ -98,9 +98,6 @@ under the License. <field name="submitButton" use-when="emplPosition==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="submitButton" use-when="emplPosition!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditEmplPositionFtl" type="single" extends="EditEmplPosition"> - <alt-target use-when="emplPosition==null" target="createEmplPositionFtl"/> - </form> <form name="ListEmplPositionFulfillments" type="list" target="updateEmplPositionFulfillment" title="" paginate-target="findEmplPositionFulfillments" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -346,34 +343,4 @@ under the License. <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListEmplPositionsFtl" extends="ListEmplPositions"> - <field name="salaryFlag"><hidden/></field> - <field name="exemptFlag"><hidden/></field> - <field name="fulltimeFlag"><hidden/></field> - <field name="temporaryFlag"><hidden/></field> - <field name="actualFromDate"><hidden/></field> - <field name="actualThruDate"><hidden/></field> - <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.CommonRemove}" target="removeEmlpPosition"> - <parameter param-name="emplPositionId"/> - <parameter param-name="partyId"/> - </hyperlink> - </field> - </form> - <form name="AddEmplPositionFulfillmentFtl" type="single" target="createEmplPositionFulfillmentFtl" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createEmplPositionFulfillment"/> - <field name="partyId" tooltip="${uiLabelMap.CommonRequired}"> - <drop-down allow-empty="false" > - <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId"> - <entity-constraint name="roleTypeId" value="EMPLOYEE"/> - <entity-order-by field-name="partyId"/> - </entity-options> - </drop-down> - </field> - <field name="emplPositionId"><hidden /></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"/> - <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> - </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |