Changeset 20555

Show
Ignore:
Timestamp:
03/09/10 03:42:39 (5 months ago)
Author:
ritesh
Message:

- changes in database related to charge-code table creation script.
- changes related to security filter for charge code
- some changes in task creation page for charge code.
- and some JS changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/db/oracle/create-scripts/versions/9.2.0/tables/create_pn_charge_code.sql

    r20542 r20555  
    1313 * If not, see http://www.gnu.org/licenses/gpl-3.0.html 
    1414*/ 
    15 prompt 
    16 prompt Creating table PN_CHARGE_CODE 
    17 prompt ======================== 
    18 prompt 
    1915create table PNET.PN_CHARGE_CODE 
    2016( 
    …… 
    2420  CODE_NUMBER   VARCHAR2(50) not null, 
    2521  CODE_DESC   VARCHAR2(200) not null, 
    26   RECORD_STATUS VARCHAR2(1) not null 
     22  RECORD_STATUS VARCHAR2(1) not null, 
    2723  CONSTRAINT CODE_PK PRIMARY KEY (CODE_ID) 
    2824) 
    29 tablespace DATA01 
    30   pctfree 10 
    31   initrans 1 
    32   maxtrans 255 
    33   storage 
    34   ( 
    35     initial 64K 
    36     minextents 1 
    37     maxextents unlimited 
    38   ); 
     25/ 

  • trunk/core/db/oracle/create-scripts/versions/9.2.0/tables/create_pn_object_has_charge_code.sql

    r20542 r20555  
    1313 * If not, see http://www.gnu.org/licenses/gpl-3.0.html 
    1414*/ 
    15 prompt 
    16 prompt Creating table PN_OBJECT_HAS_CHARGE_CODE 
    17 prompt ==================================== 
    18 prompt 
    1915create table PNET.PN_OBJECT_HAS_CHARGE_CODE 
    2016( 
    2117  OBJECT_ID NUMBER(20) not null, 
    22   CODE_ID  NUMBER(20) not null 
     18  CODE_ID  NUMBER(20) not null, 
    2319  SPACE_ID  NUMBER(20) not null 
    2420) 
    25 tablespace DATA01 
    26   pctfree 10 
    27   initrans 1 
    28   maxtrans 255 
    29   storage 
    30   ( 
    31     initial 64K 
    32     minextents 1 
    33     maxextents unlimited 
    34   ); 
     21/ 
     22 
    3523alter table PNET.PN_OBJECT_HAS_CHARGE_CODE 
    3624  add constraint PN_OBJECT_HAS_CHARGE_CODE_PK primary key (OBJECT_ID, SPACE_ID) 
    37   using index  
    38   tablespace DATA01 
    39   pctfree 10 
    40   initrans 2 
    41   maxtrans 255 
    42   storage 
    43   ( 
    44     initial 64K 
    45     minextents 1 
    46     maxextents unlimited 
    47   ); 
     25/ 
     26 
    4827alter table PNET.PN_OBJECT_HAS_CHARGE_CODE 
    4928  add constraint PN_OBJECT_HAS_CHARGE_CODE_FK1 foreign key (OBJECT_ID) 
    50   references PNET.PN_OBJECT (OBJECT_ID); 
     29  references PNET.PN_OBJECT (OBJECT_ID) 
     30/ 
    5131 
    5232alter table PNET.PN_OBJECT_HAS_CHARGE_CODE 
    5333  add constraint PN_OBJECT_HAS_CHARGE_CODE_FK2 foreign key (CODE_ID) 
    54   references PNET.PN_CHARGE_CODE (CODE_ID); 
     34  references PNET.PN_CHARGE_CODE (CODE_ID) 
     35/ 

  • trunk/core/src/net/project/security/ServletSecurityProvider.java

    r20234 r20555  
    320320        // Project Portfolio module 
    321321        addIgnoreAuthenticationDirectory("portfolio"); 
     322         
     323        //Charge-code 
     324        addIgnoreAuthenticationDirectory("chargecode"); 
    322325         
    323326        // Timesheet module  

  • trunk/core/src/net/project/view/pages/chargecode/ManageChargeCode.java

    r20547 r20555  
    1111import net.project.view.pages.base.BasePage; 
    1212 
     13import org.apache.commons.collections.CollectionUtils; 
    1314import org.apache.tapestry5.annotations.Property; 
    1415import org.slf4j.Logger; 
    …… 
    9192 
    9293        public int getTotalChargeCodes(){ 
    93                 return chargeCodeList.size(); 
     94                return CollectionUtils.isEmpty(chargeCodeList) ? 0 : chargeCodeList.size(); 
    9495        } 
    9596         

  • trunk/core/web/WEB-INF/tomcat/web.xml

    r20213 r20555  
    213213    <filter-mapping> 
    214214        <filter-name>sessionAccessFilter</filter-name> 
     215        <url-pattern>/chargecode/*</url-pattern> 
     216    </filter-mapping> 
     217     
     218    <filter-mapping> 
     219        <filter-name>sessionAccessFilter</filter-name> 
    215220        <url-pattern>/ajax/schedule/WorkplanRetrieve</url-pattern> 
    216221    </filter-mapping> 
    …… 
    304309        <filter-name>securityFilter</filter-name> 
    305310        <url-pattern>/workplan/*</url-pattern> 
     311    </filter-mapping> 
     312     
     313    <filter-mapping> 
     314        <filter-name>securityFilter</filter-name> 
     315        <url-pattern>/chargecode/*</url-pattern> 
    306316    </filter-mapping> 
    307317     

  • trunk/core/web/jsp/schedule/TaskEdit.jsp

    r20551 r20555  
    971971                chargeCodeManager.setChargeCodeList(ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeByProjectId(spaceId)); 
    972972                        if(CollectionUtils.isNotEmpty(chargeCodeManager.getChargeCodeList())){ 
    973                                 PnChargeCode chargeCode = ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeApliedOnTask(Integer.valueOf(scheduleEntry.getID()),spaceId);   
     973                                PnChargeCode chargeCode = null; 
     974                                if(!action.equals(String.valueOf(Action.CREATE))) 
     975                                        chargeCode = ServiceFactory.getInstance().getPnChargeCodeService().getChargeCodeApliedOnTask(Integer.valueOf(scheduleEntry.getID()),spaceId);   
    974976                                String chargeCodeId = ""; 
    975977                                if(chargeCode != null) 
    976                               chargeCodeId = chargeCode.getCodeId().toString(); 
     978                                      chargeCodeId = chargeCode.getCodeId().toString(); 
    977979                %> 
    978980                        <tr align="left" valign="middle"> 

  • trunk/core/web/src/chargecode.js

    r20554 r20555  
    7676// Method to hide popup widow 
    7777function hideUploadPopup(){ 
     78        if(!document.getElementById('uploadDialogue')){ 
     79                return; 
     80        } 
    7881        document.getElementById('uploadDialogue').removeChild(uploadBody); 
    7982        document.getElementsByTagName('body')[0].removeChild(uploadDialogue); 
    …… 
    110113                success: function(result, request){      
    111114                        if(result.responseText == 'updated'){    
    112                                 updateRowData(codeId, codeNo, codeName, description); 
     115                                updateRowData(chargeCodeId, chargeCodeNo, chargeCodeName, chargeCodeDesc); 
    113116                                removeLoadingDiv();              
    114117                        } else if (result.responseText == 'deleted'){ 
    115                                 removeDeletedChargeCodeRow(codeId); 
     118                                removeDeletedChargeCodeRow(chargeCodeId); 
    116119                        } 
    117120                        else { 
    …… 
    130133// Update Row Data when charge code is updated 
    131134function updateRowData(chargeCodeId, chargeCodeNo, chargeCodeName, chargeCodeDesc){ 
    132         var cell = document.getElementById(codeId).cells; 
    133         cell[0].innerHTML = codeNo; 
    134         cell[1].innerHTML = codeName; 
    135         cell[2].innerHTML = description; 
     135        var cell = document.getElementById(chargeCodeId).cells; 
     136        cell[0].innerHTML = chargeCodeNo; 
     137        cell[1].innerHTML = chargeCodeName; 
     138        cell[2].innerHTML = chargeCodeDesc; 
    136139        resetChargeCodeDataVariable(); 
    137140}