Changeset 370


Ignore:
Timestamp:
14 Aug 2006, 22:02:18 (18 years ago)
Author:
joachim
Message:

allow entering and changing of ID's,

M profiles/default/vocabularies/courselevel.xml
A profiles/default/schemas/student_study_course.xml
M profiles/default/schemas/faculty.xml
M profiles/default/workflows.xml
M profiles/default/layouts/certificate.xml
M profiles/default/layouts/waeup_common.xml
A profiles/default/layouts/student_study_course.xml
M profiles/default/layouts/study_level.xml
M profiles/default/layouts/course.xml
M profiles/default/layouts/department.xml
M profiles/default/layouts/faculty.xml
M profiles/default/types/Certificate.xml
M profiles/default/types/Semester.xml
A profiles/default/types/StudentStudyCourse.xml
M profiles/default/types/StudyLevel.xml
M profiles/default/types/Course.xml
M profiles/default/types/CertificatesFolder.xml
M profiles/default/types/CertificateCourse.xml
M profiles/default/types/AcademicsFolder.xml
M profiles/default/types/Faculty.xml
M profiles/default/types/CoursesFolder.xml
A skins/waeup_default/id_rename_form.pt
A skins/waeup_default/id_rename.py
A skins/waeup_default/waeup_document_create_do.py
M skins/waeup_academics/academics_contents_display_buttons.py
M skins/waeup_academics/academics_contents.pt
M Academics.py

Location:
WAeUP_SRP/trunk
Files:
6 added
21 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Academics.py

    r369 r370  
    292292                certificates.invokeFactory('Certificate', certificate_id)
    293293                c = getattr(certificates,certificate_id)
    294             dict = {'Title': certificate['Description']}
    295             dict['code'] = code
    296             dict['org_code'] = certificate.get('CertCode')
    297             dict['faculty'] = certificate.get('Faculty')
    298             dict['department'] = certificate.get('Dept')
    299             dict['max_pass'] = certificate.get('MaxPass')
    300             dict['max_load'] = certificate.get('MaxLoad')
    301             dict['admin_status'] = certificate.get('Admstatus')
    302             dict['category'] = certificate.get('category')
    303             dict['m_prefix'] = certificate.get('MPREFIX')
    304             dict['nr_years'] = int(certificate.get('Nyears'))
    305             nc = certificate.get('Ncore','1')
    306             try:
    307                 dict['n_core'] = int(nc)
    308             except:
    309                 dict['n_core'] = 1
    310             dict['start_level'] = certificate.get('StartLevel')
    311             dict['end_level'] = certificate.get('endLevel')
    312             dict['promotion_credits'] = certificate.get('PromotionCredits')
    313             dict['probation_credits'] = certificate.get('ProbationCredits')
     294                dict = {'Title': certificate['Description']}
     295                dict['code'] = code
     296                dict['faculty'] = certificate.get('Faculty')
     297                dict['department'] = certificate.get('Dept')
     298                dict['max_pass'] = certificate.get('MaxPass')
     299                dict['max_load'] = certificate.get('MaxLoad')
     300                dict['admin_status'] = certificate.get('Admstatus')
     301                dict['category'] = certificate.get('category')
     302                dict['m_prefix'] = certificate.get('MPREFIX')
     303                dict['nr_years'] = int(certificate.get('Nyears'))
     304                nc = certificate.get('Ncore','1')
     305                try:
     306                    dict['n_core'] = int(nc)
     307                except:
     308                    dict['n_core'] = 1
     309                dict['start_level'] = certificate.get('StartLevel')
     310                dict['end_level'] = certificate.get('endLevel')
     311                dict['promotion_credits'] = certificate.get('PromotionCredits')
     312                dict['probation_credits'] = certificate.get('ProbationCredits')
     313            else:
     314                dict = {}
     315            dict['original_code'] = certificate.get('CertCode')
     316            print
    314317            c.getContent().edit(mapping=dict)
    315318        return self.academics.academics_contents()
    … …  
    478481    def Title(self):
    479482        """compose title"""
    480         print self.id.upper()
    481483        ce = self.getCourseEntry(self.id.upper())
    482484        if ce:

  • WAeUP_SRP/trunk/profiles/default/layouts/certificate.xml

    r337 r370  
    2828  <property name="hidden_layout_modes"/>
    2929  <property name="hidden_readonly_layout_modes"/>
    30  </widget>
    31  <widget name="code" meta_type="String Widget">
    32   <property name="title">Code</property>
    33   <property name="fields">
    34    <element value="code"/>
    35   </property>
    36   <property name="is_required">True</property>
    37   <property name="label">Code</property>
    38   <property name="label_edit">Code</property>
    39   <property name="readonly_layout_modes"/>
    40   <property name="hidden_layout_modes"/>
    41   <property name="hidden_readonly_layout_modes"/>
    42   <property name="size_max">20</property>
    4330 </widget>
    4431 <widget name="end_level" meta_type="Select Widget">
    … …  
    10087  <property name="hidden_readonly_layout_modes"/>
    10188 </widget>
     89 <widget name="original_code" meta_type="String Widget">
     90  <property name="title">Original Code</property>
     91  <property name="fields">
     92   <element value="original_code"/>
     93  </property>
     94  <property name="label">Original Code</property>
     95  <property name="label_edit">Original Code</property>
     96  <property name="readonly_layout_modes"/>
     97  <property name="hidden_layout_modes"/>
     98  <property name="hidden_readonly_layout_modes"/>
     99 </widget>
    102100 <widget name="probation_credits" meta_type="Int Widget">
    103101  <property name="title">Probation  Credits</property>
    … …  
    136134 <table>
    137135  <row>
    138    <cell name="code"/>
     136   <cell name="original_code"/>
    139137  </row>
    140138  <row>

  • WAeUP_SRP/trunk/profiles/default/layouts/course.xml

    r336 r370  
    1717  <property name="hidden_layout_modes"/>
    1818  <property name="hidden_readonly_layout_modes"/>
    19  </widget>
    20  <widget name="code" meta_type="String Widget">
    21   <property name="title">Code</property>
    22   <property name="fields">
    23    <element value="code"/>
    24   </property>
    25   <property name="is_required">True</property>
    26   <property name="label">Code</property>
    27   <property name="label_edit">Code</property>
    28   <property name="display_width">10</property>
    2919 </widget>
    3020 <widget name="credits" meta_type="Int Widget">
    … …  
    7565 <table>
    7666  <row>
    77    <cell name="code"/>
    78   </row>
    79   <row>
    80    <cell name="org_code"/>
    81   </row>
    82   <row>
    83    <cell name="category"/>
    84   </row>
    85   <row>
    8667   <cell name="credits"/>
    87   </row>
    88   <row>
    89    <cell name="semester"/>
    9068  </row>
    9169  <row>

  • WAeUP_SRP/trunk/profiles/default/layouts/department.xml

    r199 r370  
    2828  <property name="size_max">200</property>
    2929 </widget>
     30 <widget name="code" meta_type="String Widget">
     31  <property name="title">Object ID</property>
     32  <property name="fields">
     33   <element value="code"/>
     34  </property>
     35  <property name="label">Object ID</property>
     36  <property name="label_edit">Object ID</property>
     37  <property name="readonly_layout_modes"/>
     38  <property name="hidden_layout_modes">
     39   <element value="edit"/>
     40   <element value="view"/>
     41  </property>
     42  <property name="hidden_readonly_layout_modes"/>
     43 </widget>
    3044 <table>
     45  <row>
     46   <cell name="code"/>
     47  </row>
    3148  <row>
    3249   <cell name="Title"/>

  • WAeUP_SRP/trunk/profiles/default/layouts/faculty.xml

    r369 r370  
    6464 <table>
    6565  <row>
    66    <cell name="Title"/>
    67   </row>
    68   <row>
    6966   <cell name="institution_type"/>
    7067  </row>

  • WAeUP_SRP/trunk/profiles/default/layouts/study_level.xml

    r199 r370  
    44 <property name="layout_edit_method"></property>
    55 <property name="layout_view_method"></property>
    6  <property name="style_prefix">layout_slregister_</property>
     6 <property name="style_prefix">layout_waeup_</property>
    77 <property name="flexible_widgets"/>
    88 <property name="validate_values_expr"></property>
     9 <widget name="Title" meta_type="String Widget">
     10  <property name="title">Title</property>
     11  <property name="fields">
     12   <element value="Title"/>
     13  </property>
     14  <property name="label">Level Nr</property>
     15  <property name="label_edit">Level Nr</property>
     16  <property name="readonly_layout_modes"/>
     17  <property name="hidden_layout_modes"/>
     18  <property name="hidden_readonly_layout_modes"/>
     19  <property name="display_width">40</property>
     20 </widget>
    921 <widget name="sc_id" meta_type="String Widget">
    1022  <property name="title">SC ID</property>
    … …  
    5567 <table>
    5668  <row>
    57    <cell name="sc_value"/>
    58   </row>
    59   <row>
    60    <cell name="sc_pin"/>
     69   <cell name="Title"/>
    6170  </row>
    6271 </table>

  • WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml

    r348 r370  
    1515  <property name="label_edit">Title</property>
    1616  <property name="readonly_layout_modes"/>
    17   <property name="hidden_layout_modes">
    18    <element value="view"/>
    19   </property>
     17  <property name="hidden_layout_modes"/>
    2018  <property name="hidden_readonly_layout_modes"/>
    2119  <property name="display_width">40</property>
    2220  <property name="size_max">200</property>
    2321 </widget>
     22 <widget name="code" meta_type="String Widget">
     23  <property name="title">Object ID</property>
     24  <property name="fields">
     25   <element value="code"/>
     26  </property>
     27  <property name="is_required">True</property>
     28  <property name="label">Object ID</property>
     29  <property name="label_edit">Object ID</property>
     30  <property name="readonly_layout_modes"/>
     31  <property name="hidden_layout_modes">
     32   <element value="edit"/>
     33   <element value="view"/>
     34  </property>
     35  <property name="hidden_readonly_layout_modes"/>
     36 </widget>
    2437 <table>
     38  <row>
     39   <cell name="code"/>
     40  </row>
    2541  <row>
    2642   <cell name="Title"/>

  • WAeUP_SRP/trunk/profiles/default/schemas/faculty.xml

    r369 r370  
    22<object name="faculty" meta_type="CPS Schema">
    33 <field name="bank_code" meta_type="CPS String Field"/>
     4 <field name="code" meta_type="CPS String Field"/>
    45 <field name="degree_grade" meta_type="CPS String Field"/>
    56 <field name="institution_type" meta_type="CPS String Field"/>

  • WAeUP_SRP/trunk/profiles/default/types/AcademicsFolder.xml

    r353 r370  
    2323  <element value="folder"/>
    2424 </property>
    25  <property name="layouts">
    26   <element value="common"/>
    27   <element value="metadata"/>
    28  </property>
     25 <property name="layouts"/>
    2926 <property name="layout_clusters">
    3027  <element value="metadata:metadata"/>
    … …  
    4340    url_expr="string:${object/absolute_url}/content_create?type_name=Faculty"
    4441    visible="True">
    45     <permission value="Modify portal content"/>
    46   </action>
     42  <permission value="Modify portal content"/>
     43 </action>
    4744 <action title="action_folder_contents" action_id="contents" category="object"
    4845    condition_expr="" url_expr="string:${object/absolute_url}/folder_contents"
    … …  
    5249    visible="True">
    5350  <permission value="Modify portal content"/>
    54   </action>
    55   <action title="Faculties" action_id="import_faculties" category="import"
     51 </action>
     52 <action title="Faculties" action_id="import_faculties" category="import"
    5653    condition_expr="" url_expr="string:${object_url}/loadFacultiesFromCSV"
    5754    visible="True"/>

  • WAeUP_SRP/trunk/profiles/default/types/Certificate.xml

    r353 r370  
    3434 <property name="cps_is_portlet">False</property>
    3535 <alias from="(Default)" to="academics_contents"/>
     36 <alias from="create_do" to="waeup_document_create_do"/>
    3637 <alias from="view" to="academics_contents"/>
    3738 <action title="View" action_id="view" category="object" condition_expr=""
    … …  
    6162 </action>
    6263</object>
     64

  • WAeUP_SRP/trunk/profiles/default/types/CertificateCourse.xml

    r353 r370  
    2222 </property>
    2323 <property name="layouts">
    24   <element value="common"/>
    2524  <element value="certificate_course"/>
    2625 </property>
    … …  
    3231 <property name="cps_is_portlet">False</property>
    3332 <alias from="(Default)" to="cpsdocument_view"/>
     33 <alias from="create_do" to="waeup_document_create_do"/>
    3434 <alias from="view" to="cpsdocument_view"/>
    35  <action title="View" action_id="view" category="object"
    36     condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
    37     visible="True">
     35 <action title="View" action_id="view" category="object" condition_expr=""
     36    url_expr="string:${object_url}/cpsdocument_view" visible="True">
    3837  <permission value="View"/>
    3938 </action>
    … …  
    4241    visible="True">
    4342  <permission value="Modify portal content"/>
    44   </action>
     43 </action>
    4544 <action title="action_metadata" action_id="metadata" category="object"
    4645    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
    … …  
    4847 <action title="Delegate" action_id="localroles" category="object"
    4948    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
    50     visible="True" >
    51     <permission value="Modify portal content"/>
    52   </action>
     49    visible="True">
     50  <permission value="Modify portal content"/>
     51 </action>
    5352</object>
     53

  • WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml

    r353 r370  
    2222  <element value="metadata"/>
    2323 </property>
    24  <property name="layouts">
    25   <element value="common"/>
    26   <element value="metadata"/>
    27  </property>
     24 <property name="layouts" />
    2825 <property name="layout_clusters">
    2926  <element value="metadata:metadata"/>

  • WAeUP_SRP/trunk/profiles/default/types/Course.xml

    r319 r370  
    2222 </property>
    2323 <property name="layouts">
    24   <element value="common"/>
     24  <element value="waeup_common"/>
    2525  <element value="course"/>
    2626 </property>
    … …  
    3232 <property name="cps_is_portlet">False</property>
    3333 <alias from="(Default)" to="cpsdocument_view"/>
     34 <alias from="create_do" to="waeup_document_create_do"/>
    3435 <alias from="view" to="cpsdocument_view"/>
    35  <action title="View" action_id="view" category="object"
    36     condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
    37     visible="True">
     36 <action title="View" action_id="view" category="object" condition_expr=""
     37    url_expr="string:${object_url}/cpsdocument_view" visible="True">
    3838  <permission value="View"/>
    3939 </action>

  • WAeUP_SRP/trunk/profiles/default/types/CoursesFolder.xml

    r353 r370  
    2222  <element value="metadata"/>
    2323 </property>
    24  <property name="layouts">
    25   <element value="common"/>
    26   <element value="metadata"/>
    27  </property>
     24 <property name="layouts" />
    2825 <property name="layout_clusters">
    2926  <element value="metadata:metadata"/>

  • WAeUP_SRP/trunk/profiles/default/types/Faculty.xml

    r366 r370  
    2424 </property>
    2525 <property name="layouts">
     26  <element value="waeup_common"/>
    2627  <element value="faculty"/>
    2728 </property>
    … …  
    3334 <property name="cps_is_portlet">False</property>
    3435 <alias from="(Default)" to="academics_contents"/>
     36 <alias from="create_do" to="waeup_document_create_do"/>
    3537 <alias from="edit" to="faculty_edit"/>
    3638 <alias from="edit_form" to="faculty_edit_form"/>
    … …  
    6062    visible="True">
    6163  <permission value="Modify portal content"/>
    62   </action>
     64 </action>
    6365</object>

  • WAeUP_SRP/trunk/profiles/default/types/Semester.xml

    r353 r370  
    1212 <property name="filter_content_types">True</property>
    1313 <property name="allowed_content_types">
     14  <element value="CertificateCourse"/>
    1415  <element value="Course"/>
    1516  <element value="CourseTicket"/>
    … …  
    2324  <element value="common"/>
    2425 </property>
    25  <property name="layouts">
    26   <element value="waeup_common"/>
    27  </property>
     26 <property name="layouts"/>
    2827 <property name="layout_clusters">
    2928  <element value="metadata:metadata"/>
    … …  
    3433 <alias from="(Default)" to="academics_contents"/>
    3534 <alias from="view" to="academics_contents"/>
    36  <action title="View" action_id="view" category="object"
    37     condition_expr="" url_expr="string:${object_url}/academics_contents"
    38     visible="True">
     35 <action title="View" action_id="view" category="object" condition_expr=""
     36    url_expr="string:${object_url}/academics_contents" visible="True">
    3937  <permission value="View"/>
    4038 </action>
    … …  
    5755    condition_expr=""
    5856    url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
    59     visible="True" >
     57    visible="True">
    6058  <permission value="Modify portal content"/>
    61   </action>
     59 </action>
    6260</object>

  • WAeUP_SRP/trunk/profiles/default/types/StudyLevel.xml

    r348 r370  
    2121  <element value="metadata"/>
    2222  <element value="common"/>
     23  <element value="study_level"/>
    2324 </property>
    2425 <property name="layouts">
    25   <element value="waeup_common"/>
     26  <element value="study_level"/>
    2627 </property>
    2728 <property name="layout_clusters">

  • WAeUP_SRP/trunk/profiles/default/vocabularies/courselevel.xml

    r311 r370  
    99 <item key="300" msgid="">Year 3 (300 Level)</item>
    1010 <item key="400" msgid="">Year 4 (400 Level)</item>
    11  <item key="500" msgid="">Year 5 (400 Level)</item>
     11 <item key="500" msgid="">Year 5 (500 Level)</item>
    1212</object>

  • WAeUP_SRP/trunk/profiles/default/workflows.xml

    r362 r370  
    5252  </type>
    5353  <type type_id="Department">
    54    <bound-workflow workflow_id="section_folder_wf"/>
     54   <bound-workflow workflow_id="waeup_base_wf"/>
    5555  </type>
    5656  <type type_id="Faculty">
    57    <bound-workflow workflow_id="section_folder_wf"/>
     57   <bound-workflow workflow_id="waeup_base_wf"/>
    5858  </type>
    5959  <type type_id="Jamb">
    … …  
    8484   <bound-workflow workflow_id="waeup_base_wf"/>
    8585  </type>
     86  <type type_id="StudentStudyCourse">
     87   <bound-workflow workflow_id="section_folder_wf"/>
     88  </type>
    8689  <type type_id="StudentsFolder">
    8790   <bound-workflow workflow_id="section_folder_wf"/>

  • WAeUP_SRP/trunk/skins/waeup_academics/academics_contents.pt

    r353 r370  
    4848    <span tal:define="redirect python: response.redirect(url)"></span>
    4949  </div>
    50     <span tal:omit-tag="" tal:condition="not: display_buttons"
     50    <span tal:omit-tag="" tal:condition="python:display_buttons or (context.portal_type in ('Certificate',))"
    5151          tal:content="structure doc/render" />
    5252
    … …  
    6969        <td align="left" valign="top" rowspan="3"></td>
    7070        <td align="left" valign="top">
    71           <span tal:condition="display_buttons" >
     71          <span tal:condition="display_buttons">
    7272          <span tal:condition="can_del">
    7373            <input type="button" value="button_select_all" class="context"
    … …  
    7676                   tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
    7777                                   % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))" />
    78             <input type="submit" name="approve_checked:method"
     78            <span tal:omit-tag="" tal:condition="python: context.portal_type != 'Certificate'">
     79              <input type="submit" name="approve_checked:method"
    7980              class="context" value="Approve" />
    8081            <input type="submit" name="retract_checked:method"
    8182              class="context" value="Retract" />
    82             <input type="submit" name="folder_delete:method" value="button_delete"
     83            </span>
     84              <input type="submit" name="folder_delete:method" value="button_delete"
    8385              class="destructive" i18n:attributes="value"
    8486              tal:attributes="onclick python:'return window.confirm(\'%s\')' %
    8587              (cpsmcat('description_confirm_delete'), )" />
     88            <input type="submit" name="id_rename_form:method"
     89              class="context" value="button_rename" i18n:attributes="value" />
    8690          </span>
    8791          </span>

  • WAeUP_SRP/trunk/skins/waeup_academics/academics_contents_display_buttons.py

    r332 r370  
    1313"""
    1414
    15 if context.portal_type in ('Department','Certificate','StudyLevel'):
     15#if context.portal_type in ('Department','Certificate','StudyLevel'):
     16if context.portal_type in ('Department','StudyLevel'):
    1617    return None
    1718return 1
Note: See TracChangeset for help on using the changeset viewer.