Changeset 280


Ignore:
Timestamp:
30 Jun 2006, 06:43:03 (18 years ago)
Author:
joachim
Message:

=renamed skins/waeup_faculty to academics

Location:
WAeUP_SRP/trunk
Files:
3 added
1 deleted
4 edited
19 copied
2 moved

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Academics.py

    r279 r280  
    4646            faculties = csv.DictReader(open("%s/import/faculty.csv" % i_home,"rb"))
    4747        except:
     48            logger.error('Error reading faculty.csv')
    4849            return
    4950        l = self.portal_catalog({'meta_type': "Faculty"})
    … …  
    9192            deps = csv.DictReader(open("%s/import/departments.csv" % i_home,"rb"))
    9293        except:
     94            logger.error('Error reading departments.csv')
    9395            return
    9496        l = self.portal_catalog({'meta_type': "Faculty"})
    … …  
    122124            courses = csv.DictReader(open("%s/import/courses.csv" % i_home,"rb"))
    123125        except:
     126            logger.error('Error reading courses.csv')
    124127            return
    125128        l = self.portal_catalog({'meta_type': "Faculty"})
    … …  
    163166            dict['code'] = course_id
    164167            dict['org_code'] = course.get('CourseCode')
    165             dict['credits'] = course.get('Credits')
     168            dict['credits'] = icourse.get('Credits')
    166169            dict['semester'] = course.get('Semester')
    167170            dict['session'] = course.get('Session')
    168171            dict['category'] = course.get('Category')
    169             dict['passmark'] = course.get('PassMark')
     172            dict['passmark'] = int(course.get('PassMark'))
    170173            c.getContent().edit(mapping=dict)
    171174    ###)
    … …  
    179182            certificates = csv.DictReader(open("%s/import/certificates.csv" % i_home,"rb"))
    180183        except:
     184            logger.error('Error reading certificates.csv')
    181185            return
    182186        f_ids = [f.id for f in self.portal_catalog({'meta_type': "Faculty"})]
    … …  
    241245            cert_courses = csv.DictReader(open("%s/import/course_level_courses.csv" % i_home,"rb"))
    242246        except:
     247            logger.error('Error reading course_level_courses.csv')
    243248            return
    244249        d_ids = [d.id for d in self.portal_catalog({'meta_type': "Department"})]
    … …  
    367372        if ce:
    368373            return "%s" % ce.credits
    369         return 0
     374        return "0"
    370375   
    371376    security.declareProtected(View,"passmark")
    … …  
    374379        ce = self.getCourseEntry(self.id)
    375380        if ce:
    376             return "%s" % ce.passmark
    377         return "No such course"
     381            return "%s" % ce.passmark.split(',')[0]
     382        return "0"
     383
     384    security.declareProtected(View,"coursepath")
     385    def coursepath(self):
     386        """coursepath from course"""
     387        ce = self.getCourseEntry(self.id)
     388        if ce:
     389            return ce.getPath()
     390        return "?"
    378391   
    379392

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

    r274 r280  
    55 <object name="waeup_default" meta_type="Filesystem Directory View"
    66    directory="WAeUP_SRP/skins/waeup_default"/>
    7  <object name="waeup_faculty" meta_type="Filesystem Directory View"
    8     directory="WAeUP_SRP/skins/waeup_faculty"/>
     7 <object name="waeup_academics" meta_type="Filesystem Directory View"
     8    directory="WAeUP_SRP/skins/waeup_academics"/>
    99 <object name="waeup_student" meta_type="Filesystem Directory View"
    1010    directory="WAeUP_SRP/skins/waeup_student"/>
    … …  
    1212  <layer name="waeup_default" insert-after="custom"/>
    1313  <layer name="waeup_student" insert-after="cps_default"/>
    14   <layer name="waeup_faculty" insert-after="cps_default"/>
     14  <layer name="waeup_academics" insert-after="cps_default"/>
    1515 </skin-path>
    1616 <skin-path name="CPSSkins-macroless">
    1717  <layer name="waeup_default" insert-after="custom"/>
    1818  <layer name="waeup_student" insert-after="cps_default"/>
    19   <layer name="waeup_faculty" insert-after="cps_default"/>
     19  <layer name="waeup_academics" insert-after="cps_default"/>
    2020 </skin-path>
    2121</object>

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

    r274 r280  
    3434 <property name="storage_methods"/>
    3535 <property name="cps_is_portlet">False</property>
    36  <alias from="(Default)" to="temporary_view_all"/>
    37  <alias from="view" to="temporary_view_all"/>
    38  <action title="Standard View" action_id="view" category="object"
    39     condition_expr="" url_expr="string:${object_url}/temporary_view_all"
    40     visible="True">
     36 <alias from="(Default)" to="certificate_view"/>
     37 <alias from="view" to="certificate_view"/>
     38 <action title="View" action_id="view" category="object" condition_expr=""
     39    url_expr="string:${object_url}/certificate_view" visible="True">
    4140  <permission value="View"/>
    4241 </action>

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

    r279 r280  
    4040 <action title="Register for Next Year" action_id="add_level"
    4141    category="object"
    42     condition_expr="python:member and 'Student'in member.getRoles()"
     42    condition_expr="python:member and 'Student' in member.getRoles()"
    4343    url_expr="string:${object_url}/register_level" visible="True"/>
    4444 <action title="action_metadata" action_id="metadata" category="object"
    4545    condition_expr="python:member and 'Manager' in member.getRoles()"
    46     url_expr="string:${object_url}/cpsdocument_metadata" visible="True"/>
     46    url_expr="string:${object_url}/cpsdocument_metadata" visible="False"/>
    4747 <action title="delegate" action_id="localroles" category="object"
    4848    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"

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

    r279 r280  
    2929          </tr>
    3030         <tr tal:repeat="course courses">
    31             <td tal:content="course/id">
     31            <td> <a href="coures" tal:content="course/id" tal:attributes="href course/coursepath"></a>
    3232            </td>
    3333            <td tal:content="course/Title"></td>
Note: See TracChangeset for help on using the changeset viewer.