Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
05/19/08 23:47:49 (8 months ago)
Author:
bmckown
Message:

complex_obs branch: Added ability to override handlers via Spring. Added methods to update and purge ComplexData from the file system. Added support for multiple mime types in ImageHandler based on file name. Added temporary files complexObsList.jsp and complexObsForm.jsp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/complex-obs/web/WEB-INF/openmrs-servlet.xml

    r4239 r4265  
    6161                                <prop key="admin/observations/mimeType.list">mimeTypeList</prop> 
    6262                                <prop key="admin/observations/mimeType.form">mimeTypeForm</prop> 
     63                <prop key="admin/observations/complexObs.list">complexObsList</prop> 
     64                <prop key="admin/observations/complexObs.form">complexObsForm</prop> 
    6365 
    6466                                <prop key="admin/users/user.list">userList</prop> 
    …… 
    8890                                <prop key="admin/concepts/conceptDatatype.list">conceptDatatypeList</prop> 
    8991                                <prop key="admin/concepts/conceptDatatype.form">conceptDatatypeForm</prop> 
    90                 <prop key="admin/concepts/conceptComplexHandler.list">conceptComplexHandlerList</prop> 
    91                 <prop key="admin/concepts/conceptComplexHandler.form">conceptComplexHandlerForm</prop> 
    9292                                <prop key="admin/concepts/conceptProposal.list">conceptProposalList</prop> 
    9393                                <prop key="admin/concepts/conceptProposal.form">conceptProposalForm</prop> 
    …… 
    248248        <!-- ** /Mime Type ** --> 
    249249 
     250    <!-- ** Complex Obs ** --> 
     251    <bean id="complexObsList" class="org.openmrs.web.controller.observation.ComplexObsListController"> 
     252        <property name="sessionForm"><value>true</value></property> 
     253        <property name="commandName"><value>complexObsList</value></property> 
     254        <property name="formView"><value>/admin/observations/complexObsList</value></property> 
     255        <property name="successView"><value>complexObs.list</value></property> 
     256    </bean> 
     257 
     258    <!--  Validator and Form Controller for the add/edit order types page --> 
     259    <bean id="complexObsValidator" class="org.openmrs.web.controller.observation.ComplexObsValidator" /> 
     260    <bean id="complexObsForm" class="org.openmrs.web.controller.observation.ComplexObsFormController"> 
     261        <property name="sessionForm"><value>true</value></property> 
     262        <property name="commandName"><value>complexObs</value></property> 
     263        <property name="validator"> 
     264            <ref bean="complexObsValidator" /> 
     265        </property> 
     266        <property name="formView"><value>/admin/observations/complexObsForm</value></property> 
     267        <property name="successView"><value>complexObs.list</value></property> 
     268    </bean> 
     269    <!-- ** /Complex Obs ** --> 
     270 
    250271        <!-- ====== /Observation Sector ====== --> 
    251272 
    …… 
    709730        </bean> 
    710731        <!--  ** /Concept Datatype ** --> 
    711     <!--  ** Concept Complex Handler ** --> 
    712     <bean id="conceptComplexHandlerList" 
    713         class="org.openmrs.web.controller.concept.ComplexHandlerListController"> 
    714         <property name="sessionForm"><value>true</value></property> 
    715         <property name="commandName"><value>complexHandlerList</value></property> 
    716         <property name="formView"><value>/admin/concepts/conceptComplexHandlerList</value></property> 
    717         <property name="successView"><value>conceptComplexHandler.list</value></property> 
    718     </bean> 
    719  
    720     <!--  Validator and Form Controller for the add/edit concept types page --> 
    721     <bean id="conceptComplexHandlerValidator" 
    722         class="org.openmrs.web.controller.concept.ComplexHandlerValidator" /> 
    723      
    724     <bean id="conceptComplexHandlerForm" 
    725         class="org.openmrs.web.controller.concept.ComplexHandlerFormController"> 
    726         <property name="sessionForm"><value>true</value></property> 
    727         <property name="commandName"><value>complexHandlerForm</value></property> 
    728         <property name="validator"> 
    729             <ref bean="conceptComplexHandlerValidator" /> 
    730         </property> 
    731         <property name="formView"><value>/admin/concepts/conceptComplexHandlerForm</value></property> 
    732         <property name="successView"><value>conceptComplexHandler.list</value></property> 
    733     </bean> 
    734     <!--  ** /Concept Complex Handler ** --> 
    735732        <!--  ** ConceptWord ** --> 
    736733        <bean id="conceptWordForm" 
    …… 
    20532050        </bean> 
    20542051 
    2055     <!--  COMPLEX OBS HANDLER SECTION  
     2052    <!--  COMPLEX OBS HANDLER SECTION --> 
    20562053    <bean parent="obsServiceTarget" > 
    20572054        <property name="handlers"> 
    20582055            <map> 
    20592056                <entry> 
    2060                     <key><value>WebImageHandler</value></key> 
    2061                     <bean class="org.openmrs.observation.handler.WebImageHandler"/> 
     2057                    <key><value>DisableThisTemprarilyImageHandler</value></key> 
     2058                    <bean class="org.openmrs.web.controller.observation.handler.WebImageHandler"/> 
    20622059                </entry> 
    20632060            </map> 
    20642061        </property> 
    20652062    </bean> 
    2066     --> 
     2063     
    20672064 
    20682065        <!-- CALENDAR SECTION -->