Context navigation

← Previous change
Next change →

Changeset 7321 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

10 Dec 2011, 06:15:17 (14 years ago)

Author:

Henrik Bettermann

Message:

Replace the term 'WAeUP' by SIRP which is a WAeUP product.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

: 6 edited

browser.py (modified) (36 diffs)
interfaces.py (modified) (10 diffs)
student.py (modified) (2 diffs)
viewlets.py (modified) (5 diffs)
vocabularies.py (modified) (2 diffs)
workflow.py (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

-                      r7318
+                      r7321
 from waeup.sirp.accesscodes.workflow import USED
 from waeup.sirp.browser import (
     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
+    SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
     ContactAdminForm)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
 …
     ManageActionButton, AddActionButton)
 from waeup.sirp.interfaces import (
     IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
+    ISIRPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
 from waeup.sirp.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget,
 …
         return self.context.level_title
 class StudentsContainerPage(WAeUPPage):
+class StudentsContainerPage(SIRPPage):
     """The standard view for student containers.
     """
 …
         return
 class SetPasswordPage(WAeUPPage):
     grok.context(IWAeUPObject)
+class SetPasswordPage(SIRPPage):
+    grok.context(ISIRPObject)
     grok.name('setpassword')
     grok.require('waeup.Public')
 …
 class StudentsContainerManagePage(WAeUPPage):
+class StudentsContainerManagePage(SIRPPage):
     """The manage page for student containers.
     """
 …
     target = 'addstudent'
 class StudentAddFormPage(WAeUPAddFormPage):
+class StudentAddFormPage(SIRPAddFormPage):
     """Add-form to add a student.
     """
 …
         return
 class StudentBaseDisplayFormPage(WAeUPDisplayFormPage):
+class StudentBaseDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student base data
     """
 …
     target = 'manage_base'
 class StudentBaseManageFormPage(WAeUPEditFormPage):
+class StudentBaseManageFormPage(SIRPEditFormPage):
     """ View to manage student base data
     """
 …
         return
 class StudentClearanceDisplayFormPage(WAeUPDisplayFormPage):
+class StudentClearanceDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student clearance data
     """
 …
             self.context.getStudent(), studentview)
 class StudentClearanceManageFormPage(WAeUPEditFormPage):
+class StudentClearanceManageFormPage(SIRPEditFormPage):
     """ Page to edit student clearance data
     """
 …
         return
 class StudentPersonalDisplayFormPage(WAeUPDisplayFormPage):
+class StudentPersonalDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student personal data
     """
 …
     target = 'edit_personal'
 class StudentPersonalManageFormPage(WAeUPEditFormPage):
+class StudentPersonalManageFormPage(SIRPEditFormPage):
     """ Page to edit student clearance data
     """
 …
         return
 class StudyCourseDisplayFormPage(WAeUPDisplayFormPage):
+class StudyCourseDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display the student study course data
     """
 …
     target = 'manage'
 class StudyCourseManageFormPage(WAeUPEditFormPage):
+class StudyCourseManageFormPage(SIRPEditFormPage):
     """ Page to edit the student study course data
     """
 …
         return
 class StudyLevelDisplayFormPage(WAeUPDisplayFormPage):
+class StudyLevelDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student study levels
     """
 …
     target = 'manage'
 class StudyLevelManageFormPage(WAeUPEditFormPage):
+class StudyLevelManageFormPage(SIRPEditFormPage):
     """ Page to edit the student study level data
     """
 …
         return
 class CourseTicketAddFormPage(WAeUPAddFormPage):
+class CourseTicketAddFormPage(SIRPAddFormPage):
     """Add a course ticket.
     """
 …
         self.redirect(self.url(self.context))
 class CourseTicketDisplayFormPage(WAeUPDisplayFormPage):
+class CourseTicketDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display course tickets
     """
 …
     target = 'manage'
 class CourseTicketManageFormPage(WAeUPEditFormPage):
+class CourseTicketManageFormPage(SIRPEditFormPage):
     """ Page to manage course tickets
     """
 …
 # We don't need the display form page yet
 #class PaymentsDisplayFormPage(WAeUPDisplayFormPage):
+#class PaymentsDisplayFormPage(SIRPDisplayFormPage):
 #    """ Page to display the student payments
 #    """
 …
 # This manage form page is for both students and students officers.
 class PaymentsManageFormPage(WAeUPEditFormPage):
+class PaymentsManageFormPage(SIRPEditFormPage):
     """ Page to manage the student payments
     """
 …
 #    target = 'manage'
 class OnlinePaymentAddFormPage(WAeUPAddFormPage):
+class OnlinePaymentAddFormPage(SIRPAddFormPage):
     """ Page to add an online payment ticket
     """
 …
         return
 class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
+class OnlinePaymentDisplayFormPage(SIRPDisplayFormPage):
     """ Page to view an online payment ticket
     """
 …
 # We don't need the display form page yet
 #class AccommodationDisplayFormPage(WAeUPDisplayFormPage):
+#class AccommodationDisplayFormPage(SIRPDisplayFormPage):
 #    """ Page to display the student accommodation data
 #    """
 …
 # This manage form page is for both students and students officers.
 class AccommodationManageFormPage(WAeUPEditFormPage):
+class AccommodationManageFormPage(SIRPEditFormPage):
     """ Page to manage bed tickets.
     """
 …
     target = 'add'
 class BedTicketAddPage(WAeUPPage):
+class BedTicketAddPage(SIRPPage):
     """ Page to add an online payment ticket
     """
 …
         return
 class BedTicketDisplayFormPage(WAeUPDisplayFormPage):
+class BedTicketDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display bed tickets
     """
 …
         return
 class StudentHistoryPage(WAeUPPage):
+class StudentHistoryPage(SIRPPage):
     """ Page to display student clearance data
     """
 …
         return self.view.url(self.view.context, self.target)
 class StudentBaseEditFormPage(WAeUPEditFormPage):
+class StudentBaseEditFormPage(SIRPEditFormPage):
     """ View to edit student base data
     """
 …
         return
 class StudentChangePasswordPage(WAeUPEditFormPage):
+class StudentChangePasswordPage(SIRPEditFormPage):
     """ View to manage student base data
     """
 …
         return
 class StudentFilesUploadPage(WAeUPPage):
+class StudentFilesUploadPage(SIRPPage):
     """ View to upload files by student
     """
 …
         return self.view.url(self.view.context, self.target)
 class StartClearancePage(WAeUPPage):
+class StartClearancePage(SIRPPage):
     grok.context(IStudent)
     grok.name('start_clearance')
 …
         return
 class RequestClearancePage(WAeUPPage):
+class RequestClearancePage(SIRPPage):
     grok.context(IStudent)
     grok.name('request_clearance')
 …
         return self.view.url(self.view.context, self.target)
 class StartCourseRegistrationPage(WAeUPPage):
+class StartCourseRegistrationPage(SIRPPage):
     grok.context(IStudentStudyCourse)
     grok.name('start_course_registration')
 …
         return self.view.url(self.view.context, self.target)
 class AddStudyLevelFormPage(WAeUPEditFormPage):
+class AddStudyLevelFormPage(SIRPEditFormPage):
     """ Page for students to add current study levels
     """
 …
         return self.view.url(self.view.context, self.target)
 class StudyLevelEditFormPage(WAeUPEditFormPage):
+class StudyLevelEditFormPage(SIRPEditFormPage):
     """ Page to edit the student study level data by students
     """

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

-                      r7304
+                      r7321
 from zope import schema
 from waeup.sirp.interfaces import (
     IWAeUPObject, academic_sessions_vocab, validate_email)
+    ISIRPObject, academic_sessions_vocab, validate_email)
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.university.vocabularies import CourseSource, study_modes
 …
         """
 class IStudentsContainer(IWAeUPObject):
+class IStudentsContainer(ISIRPObject):
     """A students container contains university students.
 …
         """
 class IStudentNavigation(IWAeUPObject):
+class IStudentNavigation(ISIRPObject):
     """Interface needed for student navigation.
 …
         """
 class IStudentBase(IWAeUPObject):
+class IStudentBase(ISIRPObject):
     """Representation of student base data.
 …
+        )
 class IStudentClearance(IWAeUPObject):
+class IStudentClearance(ISIRPObject):
     """Representation of student clearance data.
 …
+        )
 class IStudentPersonal(IWAeUPObject):
+class IStudentPersonal(ISIRPObject):
     """Representation of student personal data.
 …
+        )
 class IStudentStudyCourse(IWAeUPObject):
+class IStudentStudyCourse(ISIRPObject):
     """A container for student study levels.
 …
+        )
 class IStudentStudyLevel(IWAeUPObject):
+class IStudentStudyLevel(ISIRPObject):
     """A container for course tickets.
 …
+        )
 class ICourseTicket(IWAeUPObject):
+class ICourseTicket(ISIRPObject):
     """A course ticket.
 …
+        )
 class IStudentAccommodation(IWAeUPObject):
+class IStudentAccommodation(ISIRPObject):
     """A container for student accommodation objects.
     """
 class IBedTicket(IWAeUPObject):
+class IBedTicket(ISIRPObject):
     """A ticket for accommodation booking.

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

-                      r7256
+                      r7321
 from waeup.sirp.interfaces import (
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler)
 from waeup.sirp.image import WAeUPImageFile
+from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
 from waeup.sirp.students.interfaces import (
 …
             StudentFileStoreHandler, self).createFile(
             store, root,  filename, file_id, file)
         return file, path, WAeUPImageFile(
+        return file, path, SIRPImageFile(
             file_obj.filename, file_obj.data)

main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py

-                      r7319
+                      r7321
 from zope.interface import Interface
 from waeup.sirp.interfaces import (
     IWAeUPObject, IExtFileStore, IFileStoreNameChooser)
+    ISIRPObject, IExtFileStore, IFileStoreNameChooser)
 from waeup.sirp.utils.helpers import string_from_bytes, file_size
 from waeup.sirp.browser import DEFAULT_IMAGE_PATH
 …
 from waeup.sirp.students.interfaces import IStudent, IStudentClearance
 grok.context(IWAeUPObject) # Make IWAeUPObject the default context
+grok.context(ISIRPObject) # Make ISIRPObject the default context
 grok.templatedir('browser_templates')
 …
     grok.baseclass()
     grok.viewletmanager(StudentManageSidebar)
     grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(5)
 …
     grok.baseclass()
     grok.viewletmanager(StudentMenu)
     grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(5)
 …
     """
     grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.order(4)
     grok.require('waeup.viewStudentsTab')

main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

-                      r7214
+                      r7321
 from zc.sourcefactory.basic import BasicSourceFactory
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.university.vocabularies import course_levels
 lgas_vocab = SimpleWAeUPVocabulary(
+lgas_vocab = SimpleSIRPVocabulary(
     *sorted([(x[1],x[0]) for x in LGAS]))
 …
         return title
 verdicts = SimpleWAeUPVocabulary(
+verdicts = SimpleSIRPVocabulary(
     ('not yet','0'),
     ('Successful student','A'),

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

-                      r7133
+                      r7321
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.sirp.interfaces import (
     IObjectHistory, IWAeUPWorkflowInfo,
+    IObjectHistory, ISIRPWorkflowInfo,
     CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
     REGISTERED, VALIDATED)
 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
 from waeup.sirp.utils.helpers import get_current_principal
 from waeup.sirp.students.interfaces import IStudent
 …
 UNLOCK_CLEARANCE_TRANS = ('reset3', 'reset4', 'start_clearance')
 registration_workflow = WAeUPWorkflow(REGISTRATION_TRANSITIONS)
+registration_workflow = SIRPWorkflow(REGISTRATION_TRANSITIONS)
 class RegistrationWorkflowState(WorkflowState, grok.Adapter):
 …
     state_id = 'wf.registration.id'
 class RegistrationWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
+class RegistrationWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
     """Adapter to adapt Student objects to workflow info objects.
     """
     grok.context(IStudent)
     grok.provides(IWAeUPWorkflowInfo)
+    grok.provides(ISIRPWorkflowInfo)
     def __init__(self, context):

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: