svn commit: r575953 - in /ofbiz/trunk/applications/humanres: config/ script/org/ofbiz/humanres/ servicedef/ webapp/humanres/WEB-INF/ webapp/humanres/includes/ widget/ widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r575953 - in /ofbiz/trunk/applications/humanres: config/ script/org/ofbiz/humanres/ servicedef/ webapp/humanres/WEB-INF/ webapp/humanres/includes/ widget/ widget/forms/

apatel-2
Author: apatel
Date: Sat Sep 15 11:35:31 2007
New Revision: 575953

URL: http://svn.apache.org/viewvc?rev=575953&view=rev
Log:
Screens/services for edit update of SkillType data.

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties
    ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
    ofbiz/trunk/applications/humanres/servicedef/services.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.properties Sat Sep 15 11:35:31 2007
@@ -69,6 +69,7 @@
 HumanResListPayHistories=List Pay Histories
 HumanResListPayrollPreferences=List Payroll Preferences
 HumanResListSalaryStep=List Salary Step
+HumanResListSkillTypes=List Skill Types
 HumanResListTerminationReasons=List Termination Reasons
 HumanResListUnemploymentClaim=List Unemployment Claim
 HumanResListValidResponsibility=List Valid Responsibility
@@ -101,6 +102,7 @@
 HumanResNewPayHistory=New Pay History
 HumanResNewPayrollPreferences=New Payroll Preferences
 HumanResNewSalaryStep=New Salary Step
+HumanResNewSkillType=New Skill Type
 HumanResNewTerminationReason=New Termination Reason
 HumanResNewUnemploymentClaim=New Unemployment Claim
 HumanResPartyBenifit=Party Benifit
@@ -115,6 +117,8 @@
 HumanResPayrollPreferenceSeqId=Payroll Preference SequenceId
 HumanResResponsibilityTypeId=Responsibility TypeId
 HumanResSalaryStepSeqId=Salary Step Sequence Id
+HumanResSkillType=Skill Type
+HumanResSkillTypeId=Skill Type Id
 HumanResTerminationReason=Termination Reason
 HumanResTerminationReasonId=Termination Reason Id
 HumanResTerminationTypeId=Termination Type Id
@@ -123,9 +127,11 @@
 PageTitleEditEmplPosition=Edit Empl Position
 PageTitleEditPartyReview=Edit PerfReview
 PageTitleEditPartyReviewItem==Edit PerrfReviewItem
+PageTitleEditSkillType=Edit Skill Type
 PageTitleEditValidResponsibility=Edit ValidResponsibility
 PageTitleListPartyReview=List PerfReview
 PageTitleListPartyReviewItems=List PerfReviewItem
+PageTitleListSkillTypes=List Skill Types
 PageTitleListEmplPosition=List EmplPosition
 PageTitleListEmplPositionFulfillments=List EmplPosition Fulfillments
 PageTitleListEmplPositionResponsibilities=List EmplPosition Responsibilities
@@ -160,4 +166,4 @@
 FormFieldTitle_applyingPartyId=Applying Party Id
 FormFieldTitle_referredByPartyId=Referred By Party Id
 FormFieldTitle_applicationDate=Application Date
-FormFieldTitle_applicationId=Application Id
\ No newline at end of file
+FormFieldTitle_applicationId=Application Id

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Sat Sep 15 11:35:31 2007
@@ -446,4 +446,23 @@
         <entity-one entity-name="ValidResponsibility" value-name="lookedUpValue"/>        
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
+    <!-- Skill Types -->
+    <simple-method method-name="createSkillType" short-description="Create a SkillType">
+        <make-value entity-name="SkillType" value-name="newEntity"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <sequenced-id-to-env sequence-name="SkillType" env-name="newEntity.skillTypeId"/>        
+        <field-to-result field-name="newEntity.skillTypeId" result-name="skillTypeId"/>
+        <create-value value-name="newEntity"/>        
+    </simple-method>
+    
+    <simple-method method-name="updateSkillType" short-description="Update SkillType">
+        <entity-one entity-name="SkillType" value-name="lookedUpValue"/>
+        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    
+    <simple-method method-name="deleteSkillType" short-description="Delete SkillType">
+        <entity-one entity-name="SkillType" value-name="lookedUpValue"/>        
+        <remove-value value-name="lookedUpValue"/>
+    </simple-method>
 </simple-methods>        

Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Sat Sep 15 11:35:31 2007
@@ -529,5 +529,27 @@
         location="org/ofbiz/humanres/permission/HumanResPermissionServices.xml" invoke="humanResManagerPermission" auth="true">
         <implements service="permissionInterface"/>
     </service>
+    <service name="createSkillType" engine="simple" default-entity-name="SkillType"
+             location="org/ofbiz/humanres/HumanResServices.xml" invoke="createSkillType" auth="true">
+        <description>Create Valid SkillType</description>
+        <permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
+        <auto-attributes mode="INOUT" include="pk" optional="true"/>
+        <auto-attributes mode="IN" include="nonpk" optional="true"/>
+    </service>
+    
+    <service name="updateSkillType" engine="simple" default-entity-name="SkillType"
+             location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateSkillType" auth="true">
+        <description>Update Valid SkillType</description>
+        <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
+        <auto-attributes mode="IN" include="nonpk" optional="true"/>
+    </service>
+    <service name="deleteSkillType" engine="simple" default-entity-name="SkillType"
+             location="org/ofbiz/humanres/HumanResServices.xml" invoke="deleteSkillType" auth="true">
+        <description>Delete Valid SkillType</description>
+        <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
+    </service>
 </services>
+
 

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=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Sep 15 11:35:31 2007
@@ -539,6 +539,27 @@
     <request-map uri="viewprofile">
         <response name="success" type="view" value="viewprofile"/>
     </request-map>
+    <request-map uri="findSkillTypes">
+        <response name="success" type="view" value="EditSkillTypes"/>
+    </request-map>
+    <request-map uri="EditSkillTypes">
+        <response name="success" type="view" value="EditSkillTypes"/>
+    </request-map>
+    <request-map uri="createSkillType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createSkillType"/>
+        <response name="success" type="view" value="EditSkillTypes"/>
+    </request-map>
+    <request-map uri="updateSkillType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateSkillType"/>
+        <response name="success" type="view" value="EditSkillTypes"/>
+    </request-map>
+    <request-map uri="deleteSkillType">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteSkillType"/>
+        <response name="success" type="view" value="EditSkillTypes"/>              
+    </request-map>
     <!-- ===================Lookup Request===================== -->
     <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map>    
@@ -598,4 +619,5 @@
     <view-map name="LookupTerminationReason"  type="screen" page="component://humanres/widget/LookupScreens.xml#LookupTerminationReason"/>
     <view-map name="LookupSalaryStep"  type="screen" page="component://humanres/widget/LookupScreens.xml#LookupSalaryStep"/>
     <view-map name="LookupPayGrade"  type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPayGrade"/>
+    <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
 </site-conf>

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl Sat Sep 15 11:35:31 2007
@@ -29,6 +29,7 @@
     <li<#if selected == "TerminationReason"> class="selected"</#if>><a href="<@ofbizUrl>findTerminationReasons</@ofbizUrl>">${uiLabelMap.HumanResTerminationReason}</a></li>        
     <li<#if selected == "UnemploymentClaim"> class="selected"</#if>><a href="<@ofbizUrl>findUnemploymentClaims</@ofbizUrl>">${uiLabelMap.HumanResUnemploymentClaim}</a></li>        
     <li<#if selected == "EmploymentApp"> class="selected"</#if>><a href="<@ofbizUrl>findEmploymentApps</@ofbizUrl>">${uiLabelMap.HumanResEmploymentApp}</a></li>
+    <li<#if selected == "SkillType"> class="selected"</#if>><a href="<@ofbizUrl>findSkillTypes</@ofbizUrl>">${uiLabelMap.HumanResSkillType}</a></li>
     <#if userLogin?has_content>
       <li class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
     <#else>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat Sep 15 11:35:31 2007
@@ -62,5 +62,6 @@
             <link target="EditSalarySteps?payGradeId=${payGradeId}"/>
         </menu-item>        
     </menu>
+    <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected"/>
     
 </menus>    

Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Sat Sep 15 11:35:31 2007
@@ -172,4 +172,31 @@
             </widgets>
         </section>
     </screen>                    
+    <screen name="EditSkillTypes">
+        <section>                        
+            <actions>
+                <set field="headerItem" value="SkillType"/>
+                <set field="titleProperty" value="PageTitleEditSkillType"/>
+                <set field="skillTypeId" from-field="parameters.skillTypeId"/>
+                <entity-one entity-name="SkillType" value-name="skillType" />
+            </actions>            
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                                                      
+                        <container>
+                            <link target="EditSkillTypes" text="${uiLabelMap.HumanResNewSkillType}" style="buttontext" />
+                        </container>
+                        <label>&lt;br/&gt;</label>
+                        <container style="boxoutside">
+                            <container style="screenlet-header">
+                                <label style="boxhead">${uiLabelMap.PageTitleEditSkillType}</label>
+                            </container>                                    
+                            <include-form name="ListSkillTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+                            <include-form name="EditSkillType" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
+                        </container>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>            
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=575953&r1=575952&r2=575953&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Sat Sep 15 11:35:31 2007
@@ -295,4 +295,26 @@
         <field name="submitButton" use-when="personTraining==null" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>        
         <field name="submitButton" use-when="personTraining!=null" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
      </form>      
+     <form name="ListSkillTypes" type="list" title="" target="updateSkillType">
+        <actions>
+            <entity-condition entity-name="SkillType"><order-by field-name="skillTypeId"/></entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateSkillType"/>        
+        <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display/></field>
+        <field name="description" title="${uiLabelMap.CommomDescription}"/>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteSkillType?skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>            
+    <form name="EditSkillType" type="single" target="updateSkillType" title="" default-map-name="skillType">
+        <alt-target use-when="skillType==null" target="createSkillType"/>
+        <auto-fields-service service-name="createSkillType"/>
+        <field use-when="skillType!=null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="skillType==null&amp;&amp;skillTypeId==null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><ignored/></field>
+        <field use-when="skillType==null&amp;&amp;skillTypeId!=null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${skillTypeId}]"><display/></field>        
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="submitButton" use-when="skillType==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="submitButton" use-when="skillType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
 </forms>