svn commit: r1736866 - in /ofbiz/trunk/applications/huma
Locked
svn commit: r1736866 - in /ofbiz/trunk/applications/huma
 
|
Author: jleroux
Date: Mon Mar 28 11:07:52 2016 New Revision: 1736866 URL: http://svn.apache.org/viewvc?rev=1736866&view=rev Log: A patch from Pierre Smits for <<relocate .ftl files in the humanres component>> https://issues.apache.org/jira/browse/OFBIZ-6816 Added: ofbiz/trunk/applications/humanres/template/ ofbiz/trunk/applications/humanres/template/category/ ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl (with props) ofbiz/trunk/applications/humanres/template/emplposition/ ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl (with props) ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl (with props) ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl (with props) ofbiz/trunk/applications/humanres/template/findEmployee.ftl (with props) ofbiz/trunk/applications/humanres/template/internalorg/ ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl (with props) ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl (with props) Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Added: ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl (added) +++ ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,211 @@ +<#-- +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"> +<#-- some labels are not unescaped in the JSON object so we have to do this manualy --> +function unescapeHtmlText(text) { + return jQuery('<div />').html(text).text() +} + +jQuery(window).load(createTree()); + +<#-- creating the JSON Data --> +var rawdata = [ + <#if (completedTree?has_content)> + <@fillTree rootCat = completedTree/> + </#if> + + <#macro fillTree rootCat> + <#if (rootCat?has_content)> + <#list rootCat as root> + { + "data": {"title" : unescapeHtmlText("<#if root.groupName??>${root.groupName?js_string} [${root.partyId}]<#else>${root.partyId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/viewprofile?partyId=${root.partyId}</@ofbizUrl>","onClick" : "callDocument('${root.partyId}');"}}, + "attr": {"id" : "${root.partyId}", "rel" : "Y"} + <#if root.child??> + ,"state" : "closed" + </#if> + <#if root_has_next> + }, + <#else> + } + </#if> + </#list> + </#if> + </#macro> + ]; + + <#-- create Tree--> + function createTree() { + jQuery(function () { + $.cookie('jstree_select', null); + $.cookie('jstree_open', null); + + jQuery("#tree").jstree({ + "core" : { "initially_open" : [ "${partyId}" ] }, + "plugins" : [ "themes", "json_data","ui" ,"cookies", "types", "crrm", "contextmenu"], + "json_data" : { + "data" : rawdata, + "ajax" : { "url" : "<@ofbizUrl>getHRChild</@ofbizUrl>", "type" : "POST", + "data" : function (n) { + return { + "partyId" : n.attr ? n.attr("id").replace("node_","") : 1 , + "additionParam" : "','category" , + "hrefString" : "viewprofile?partyId=" , + "onclickFunction" : "callDocument" + }; + }, + success : function(data) { + return data.hrTree; + } + } + }, + "types" : { + "valid_children" : [ "root" ], + "types" : { + "CATEGORY" : { + "icon" : { + "image" : "/images/jquery/plugins/jsTree/themes/apple/d.png", + "position" : "10px40px" + } + } + } + }, + "contextmenu": {items: customMenu} + }); + }); + } + + function callDocument(id,type) { + window.location = "viewprofile?partyId=" + id; + } + + function callEmplDocument(id,type) { + //jQuerry Ajax Request + var dataSet = {}; + URL = 'emplPositionView'; + dataSet = {"emplPositionId" : id, "ajaxUpdateEvent" : "Y"}; + + jQuery.ajax({ + url: URL, + type: 'POST', + data: dataSet, + error: function(msg) { + alert("An error occurred loading content! : " + msg); + }, + success: function(msg) { + jQuery('div.contentarea').html(msg); + } + }); + } + + function customMenu(node) { + // The default set of all items + if(node.attr('rel')=='Y'){ + var items = { + EmpPosition: { + label: "Add Employee Position", + action: function (NODE, TREE_OBJ) { + var dataSet = {}; + dataSet = {"partyId" : NODE.attr("id")}; + jQuery.ajax({ + type: "GET", + url: "EditEmplPosition", + data: dataSet, + error: function(msg) { + alert("An error occurred loading content! : " + msg); + }, + success: function(msg) { + jQuery('div.page-container').html(msg); + } + }); + } + }, + AddIntOrg: { + label: "Add Internal Organization", + action: function (NODE, TREE_OBJ) { + var dataSet = {}; + dataSet = {"headpartyId" : NODE.attr("id")}; + jQuery.ajax({ + type: "GET", + url: "EditInternalOrgFtl", + data: dataSet, + error: function(msg) { + alert("An error occurred loading content! : " + msg); + }, + success: function(msg) { + jQuery('#dialog').html(msg); + } + }); + } + }, + RemoveIntOrg: { + label: "Remove Internal Organization", + action: function (NODE, TREE_OBJ) { + var dataSet = {}; + dataSet = {"partyId" : NODE.attr("id"),"parentpartyId" : $.jstree._focused()._get_parent(node).attr("id")}; + jQuery.ajax({ + type: "GET", + url: "RemoveInternalOrgFtl", + data: dataSet, + error: function(msg) { + alert("An error occurred loading content! : " + msg); + }, + success: function(msg) { + jQuery('#dialog').html(msg); + } + }); + } + } + };} + 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: "EditEmplPositionFulfillments", + data: dataSet, + error: function(msg) { + alert("An error occurred loading content! : " + msg); + }, + success: function(msg) { + jQuery('div.page-container').html(msg); + } + }); + } + } + } + } + + if ($(node).hasClass("folder")) { + // Delete the "delete" menu item + delete items.deleteItem; + } + + return items; +} + + +</script> +<div id="dialog" title="Basic dialog"> +</div> +<div id="tree"></div> Propchange: ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/category/CategoryTree.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl (added) +++ ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,27 @@ +<#-- +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 Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editemplposition.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl (added) +++ ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,27 @@ +<#-- +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() { + $( "#person" ).dialog({ autoOpen: true, width: 450}); + }); +</script> +<div id="person" title="Add Person"> + ${screens.render("component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFulfillmentsFtl")} +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/emplposition/editperson.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl (added) +++ ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,27 @@ +<#-- +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 Propchange: ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/emplposition/removeemplposition.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/findEmployee.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/findEmployee.ftl (added) +++ ofbiz/trunk/applications/humanres/template/findEmployee.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,234 @@ +<#-- +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 extInfo = parameters.extInfo?default("N")> + +<div id="findEmployee" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployee}</li> + <#if parameters.hideFields?default("N") == "Y"> + <li><a href="<@ofbizUrl>findEmployees?hideFields=N${paramList}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li> + <#else> + <#if partyList??><li><a href="<@ofbizUrl>findEmployees?hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if> + <li><a href="javascript:document.lookupparty.submit();">${uiLabelMap.PartyLookupParty}</a></li> + </#if> + </ul> + <br class="clear"/> + </div> + <#if parameters.hideFields?default("N") != "Y"> + <div class="screenlet-body"> + <#-- NOTE: this form is setup to allow a search by partial partyId or userLoginId; to change it to go directly to + the viewprofile page when these are entered add the follow attribute to the form element: + + onsubmit="javascript:lookupparty('<@ofbizUrl>viewprofile</@ofbizUrl>');" + --> + <form method="post" name="lookupparty" action="<@ofbizUrl>findEmployees</@ofbizUrl>" class="basic-form"> + <input type="hidden" name="lookupFlag" value="Y"/> + <input type="hidden" name="hideFields" value="Y"/> + <table cellspacing="0"> + <tr><td class="label">${uiLabelMap.PartyContactInformation}</td> + <td><input type="radio" name="extInfo" value="N" onclick="javascript:refreshInfo();" <#if extInfo == "N">checked="checked"</#if>/>${uiLabelMap.CommonNone} + <input type="radio" name="extInfo" value="P" onclick="javascript:refreshInfo();" <#if extInfo == "P">checked="checked"</#if>/>${uiLabelMap.PartyPostal} + <input type="radio" name="extInfo" value="T" onclick="javascript:refreshInfo();" <#if extInfo == "T">checked="checked"</#if>/>${uiLabelMap.PartyTelecom} + <input type="radio" name="extInfo" value="O" onclick="javascript:refreshInfo();" <#if extInfo == "O">checked="checked"</#if>/>${uiLabelMap.CommonOther} + </td> + </tr> + <tr><td class='label'>${uiLabelMap.PartyPartyId}</td> + <td> + <@htmlTemplate.lookupField value='${requestParameters.partyId!}' formName="lookupparty" name="partyId" id="partyId" fieldFormName="LookupPerson"/> + </td> + </tr> + <tr><td class="label">${uiLabelMap.PartyUserLogin}</td> + <td><input type="text" name="userLoginId" value="${parameters.userLoginId!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.PartyLastName}</td> + <td><input type="text" name="lastName" value="${parameters.lastName!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.PartyFirstName}</td> + <td><input type="text" name="firstName" value="${parameters.firstName!}"/></td> + </tr> + <tr><td><input type="hidden" name="groupName" value="${parameters.groupName!}"/></td></tr> + <tr><td><input type="hidden" name="roleTypeId" value="EMPLOYEE"/></td></tr> + <#if extInfo == "P"> + <tr><td colspan="3"><hr /></td></tr><tr> + <td class="label">${uiLabelMap.CommonAddress1}</td> + <td><input type="text" name="address1" value="${parameters.address1!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.CommonAddress2}</td> + <td><input type="text" name="address2" value="${parameters.address2!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.CommonCity}</td> + <td><input type="text" name="city" value="${parameters.city!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.CommonStateProvince}</td> + <td><select name="stateProvinceGeoId"> + <#if currentStateGeo?has_content> + <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option> + <option value="${currentStateGeo.geoId}">---</option> + </#if> + <option value="ANY">${uiLabelMap.CommonAnyStateProvince}</option> + ${screens.render("component://common/widget/CommonScreens.xml#states")} + </select> + </td> + </tr> + <tr><td class="label">${uiLabelMap.PartyPostalCode}</td> + <td><input type="text" name="postalCode" value="${parameters.postalCode!}"/></td> + </tr> + </#if> + <#if extInfo == "T"> + <tr><td colspan="3"><hr /></td></tr> + <tr><td class="label">${uiLabelMap.CommonCountryCode}</td> + <td><input type="text" name="countryCode" value="${parameters.countryCode!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.PartyAreaCode}</td> + <td><input type="text" name="areaCode" value="${parameters.areaCode!}"/></td> + </tr> + <tr><td class="label">${uiLabelMap.PartyContactNumber}</td> + <td><input type="text" name="contactNumber" value="${parameters.contactNumber!}"/></td> + </tr> + </#if> + <#if extInfo == "O"> + <tr><td colspan="3"><hr /></td></tr> + <tr><td class="label">${uiLabelMap.PartyContactInformation}</td> + <td><input type="text" name="infoString" value="${parameters.infoString!}"/></td> + </tr> + </#if> + <tr><td colspan="3"><hr /></td></tr> + <tr align="center"> + <td> </td> + <td><input type="submit" value="${uiLabelMap.PartyLookupParty}" onclick="javascript:document.lookupparty.submit();"/> + <a href="<@ofbizUrl>findEmployees?roleTypeId=EMPLOYEE&hideFields=Y&lookupFlag=Y</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonShowAllRecords}</a> + </td> + </tr> + </table> + </form> + </div> + </#if> +</div> + <#if parameters.hideFields?default("N") != "Y"> + <script language="JavaScript" type="text/javascript"> + <!--// + document.lookupparty.partyId.focus(); + //--> + </script> + </#if> + <#if partyList??> + <br /> + <div id="findEmployeeResults" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.PartyPartiesFound}</li> + <#if (partyListSize > 0)> + <#if (partyListSize > highIndex)> + <li><a class="nav-next" href="<@ofbizUrl>findEmployees?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> + <#else> + <li class="disabled">${uiLabelMap.CommonNext}</li> + </#if> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li> + <#if (viewIndex > 0)> + <li><a class="nav-previous" href="<@ofbizUrl>findEmployees?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> + <#else> + <li class="disabled">${uiLabelMap.CommonPrevious}</li> + </#if> + </#if> + </ul> + <br class="clear"/> + </div> + <#if partyList?has_content> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.PartyPartyId}</td> + <td>${uiLabelMap.PartyUserLogin}</td> + <td>${uiLabelMap.PartyName}</td> + <#if extInfo?default("") == "P" > + <td>${uiLabelMap.PartyCity}</td> + </#if> + <#if extInfo?default("") == "P"> + <td>${uiLabelMap.PartyPostalCode}</td> + </#if> + <#if extInfo?default("") == "T"> + <td>${uiLabelMap.PartyAreaCode}</td> + </#if> + <td>${uiLabelMap.PartyType}</td> + <td> </td> + </tr> + <#assign alt_row = false> + <#list partyList as partyRow> + <#assign partyType = partyRow.getRelatedOne("PartyType", false)!> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> + <td><#if partyRow.containsKey("userLoginId")> + ${partyRow.userLoginId?default("N/A")} + <#else> + <#assign userLogins = partyRow.getRelated("UserLogin", null, null, false)> + <#if (userLogins.size() > 0)> + <#if (userLogins.size() > 1)> + (${uiLabelMap.CommonMany}) + <#else> + <#assign userLogin = userLogins.get(0)> + ${userLogin.userLoginId} + </#if> + <#else> + (${uiLabelMap.CommonNone}) + </#if> + </#if> + </td> + <td><#if partyRow.getModelEntity().isField("lastName") && lastName?has_content> + ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if> + <#elseif partyRow.getModelEntity().isField("groupName") && partyRow.groupName?has_content> + ${partyRow.groupName} + <#else> + <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)> + <#if partyName?has_content> + ${partyName} + <#else> + (${uiLabelMap.PartyNoNameFound}) + </#if> + </#if> + </td> + <#if extInfo?default("") == "T"> + <td>${partyRow.areaCode!}</td> + </#if> + <#if extInfo?default("") == "P" > + <td>${partyRow.city!}, ${partyRow.stateProvinceGeoId!}</td> + </#if> + <#if extInfo?default("") == "P"> + <td>${partyRow.postalCode!}</td> + </#if> + <td><#if partyType.description??>${partyType.get("description", locale)}<#else>???</#if></td> + <td class="button-col align-float"> + <a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + <div class="screenlet-body"> + <span class="h3">${uiLabelMap.PartyNoPartiesFound}</span> + </div> + </#if> + <#if lookupErrorMessage??> + <div><h3>${lookupErrorMessage}</h3></div> + </#if> + <div> </div> + </div> + </#if> Propchange: ofbiz/trunk/applications/humanres/template/findEmployee.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/findEmployee.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/findEmployee.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl (added) +++ ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,27 @@ +<#-- +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 Propchange: ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/internalorg/editinternalorg.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl?rev=1736866&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl (added) +++ ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl Mon Mar 28 11:07:52 2016 @@ -0,0 +1,37 @@ +<#-- +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!}, true)/> +<#if partyGroup?has_content> + <#assign partyname = partyGroup.groupName!/> +</#if> +<script type="text/javascript"> + <!-- + var answer = confirm ("Are you sure you want to remove '<#if partyname??>${partyname}<#else>${parameters.partyId!}</#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!}"/> + <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId!}"/> + </form> +</div> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/template/internalorg/removeinternalorg.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1736866&r1=1736865&r2=1736866&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Mon Mar 28 11:07:52 2016 @@ -78,7 +78,7 @@ under the License. <screenlet title="${uiLabelMap.FormFieldTitle_company}"> <section> <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/category/CategoryTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://humanres/template/category/CategoryTree.ftl"/></html></platform-specific> </widgets> </section> </screenlet> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=1736866&r1=1736865&r2=1736866&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Mon Mar 28 11:07:52 2016 @@ -306,7 +306,7 @@ <actions> </actions> <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://humanres/template/internalorg/editinternalorg.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -326,7 +326,7 @@ <screen name="RemoveInternalOrgFtl"> <section> <widgets> - <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://humanres/template/internalorg/removeinternalorg.ftl"/></html></platform-specific> </widgets> </section> </screen> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1736866&r1=1736865&r2=1736866&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Mon Mar 28 11:07:52 2016 @@ -41,7 +41,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://humanres/webapp/humanres/humanres/findEmployee.ftl"/></html> + <html><html-template location="component://humanres/template/findEmployee.ftl"/></html> </platform-specific> </widgets> </section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |