Changeset 7811 for main/waeup.kofa/trunk/src/waeup/kofa/applicants
- Timestamp:
- 8 Mar 2012, 19:00:51 (13 years ago)
- Location:
- main/waeup.kofa/trunk/src/waeup/kofa/applicants
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kofa/trunk/src/waeup/kofa/applicants/__init__.py
r7377 r7811 2 2 """ 3 3 # Make this a package. 4 from waeup. sirp.applicants.applicant import (4 from waeup.kofa.applicants.applicant import ( 5 5 Applicant, ApplicantFactory, ApplicantImageStoreHandler, 6 6 ApplicantImageNameChooser, 7 7 ) 8 from waeup. sirp.applicants.container import ApplicantsContainer9 from waeup. sirp.applicants.root import ApplicantsRoot10 from waeup. sirp.applicants.dynamicroles import (8 from waeup.kofa.applicants.container import ApplicantsContainer 9 from waeup.kofa.applicants.root import ApplicantsRoot 10 from waeup.kofa.applicants.dynamicroles import ( 11 11 ApplicantPrincipalRoleManager,) 12 12 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py
r7686 r7811 26 26 from zope.interface import implementedBy 27 27 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState 28 from waeup. sirp.app import University29 from waeup. sirp.image import SIRPImageFile30 from waeup. sirp.imagestorage import DefaultFileStoreHandler31 from waeup. sirp.interfaces import (32 IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, I SIRPUtils,28 from waeup.kofa.app import University 29 from waeup.kofa.image import KOFAImageFile 30 from waeup.kofa.imagestorage import DefaultFileStoreHandler 31 from waeup.kofa.interfaces import ( 32 IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, IKOFAUtils, 33 33 IExtFileStore, IPDF, IUserAccount) 34 from waeup. sirp.students.vocabularies import RegNumNotInSource35 from waeup. sirp.utils.helpers import attrs_to_fields36 from waeup. sirp.applicants.interfaces import IApplicant, IApplicantEdit37 from waeup. sirp.applicants.workflow import application_states_dict34 from waeup.kofa.students.vocabularies import RegNumNotInSource 35 from waeup.kofa.utils.helpers import attrs_to_fields 36 from waeup.kofa.applicants.interfaces import IApplicant, IApplicantEdit 37 from waeup.kofa.applicants.workflow import application_states_dict 38 38 39 39 class Applicant(grok.Container): … … 76 76 def display_fullname(self): 77 77 middlename = getattr(self, 'middlename', None) 78 sirp_utils = getUtility(ISIRPUtils)79 return sirp_utils.fullname(self.firstname, self.lastname, middlename)78 kofa_utils = getUtility(IKOFAUtils) 79 return kofa_utils.fullname(self.firstname, self.lastname, middlename) 80 80 81 81 def createStudent(self, view=None): … … 196 196 197 197 This chooser is registered as an adapter providing 198 :class:`waeup. sirp.interfaces.IFileStoreNameChooser`.198 :class:`waeup.kofa.interfaces.IFileStoreNameChooser`. 199 199 200 200 File store name choosers like this one are only convenience … … 203 203 manually setting up filenames for applicants. 204 204 205 .. seealso:: :mod:`waeup. sirp.imagestorage`205 .. seealso:: :mod:`waeup.kofa.imagestorage` 206 206 207 207 """ … … 291 291 ApplicantImageStoreHandler, self).createFile( 292 292 store, root, filename, file_id, file) 293 return file, path, SIRPImageFile(293 return file, path, KOFAImageFile( 294 294 file_obj.filename, file_obj.data) 295 295 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/authentication.py
r7364 r7811 21 21 import grok 22 22 from zope.pluggableauth.interfaces import IAuthenticatorPlugin 23 from waeup. sirp.interfaces import IAuthPluginUtility, IUserAccount24 from waeup. sirp.applicants.interfaces import IApplicant25 from waeup. sirp.students.authentication import (23 from waeup.kofa.interfaces import IAuthPluginUtility, IUserAccount 24 from waeup.kofa.applicants.interfaces import IApplicant 25 from waeup.kofa.students.authentication import ( 26 26 StudentAccount, StudentsAuthenticatorPlugin) 27 27 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py
r7271 r7811 24 24 from zope.component import queryUtility 25 25 from zope.catalog.interfaces import ICatalog 26 from waeup. sirp.interfaces import (26 from waeup.kofa.interfaces import ( 27 27 IBatchProcessor, IObjectConverter, FatalCSVError) 28 from waeup. sirp.utils.batching import BatchProcessor29 from waeup. sirp.applicants.interfaces import (28 from waeup.kofa.utils.batching import BatchProcessor 29 from waeup.kofa.applicants.interfaces import ( 30 30 IApplicantsContainer, IApplicant, IApplicantUpdateByRegNo) 31 31 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py
r7741 r7811 28 28 from hurry.workflow.interfaces import ( 29 29 IWorkflowInfo, IWorkflowState, InvalidTransitionError) 30 from waeup. sirp.applicants.interfaces import (30 from waeup.kofa.applicants.interfaces import ( 31 31 IApplicant, IApplicantEdit, IApplicantsRoot, 32 32 IApplicantsContainer, IApplicantsContainerAdd, 33 33 MAX_UPLOAD_SIZE, IApplicantOnlinePayment, IApplicantsUtils 34 34 ) 35 from waeup. sirp.applicants.workflow import INITIALIZED, STARTED, PAID, SUBMITTED36 from waeup. sirp.browser import (37 SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,35 from waeup.kofa.applicants.workflow import INITIALIZED, STARTED, PAID, SUBMITTED 36 from waeup.kofa.browser import ( 37 KOFAPage, KOFAEditFormPage, KOFAAddFormPage, KOFADisplayFormPage, 38 38 DEFAULT_PASSPORT_IMAGE_PATH) 39 from waeup. sirp.browser.interfaces import ICaptchaManager40 from waeup. sirp.browser.breadcrumbs import Breadcrumb41 from waeup. sirp.browser.layout import (39 from waeup.kofa.browser.interfaces import ICaptchaManager 40 from waeup.kofa.browser.breadcrumbs import Breadcrumb 41 from waeup.kofa.browser.layout import ( 42 42 NullValidator, jsaction, action, UtilityView) 43 from waeup. sirp.browser.pages import add_local_role, del_local_roles44 from waeup. sirp.browser.resources import datepicker, tabs, datatable, warning45 from waeup. sirp.interfaces import (46 I SIRPObject, ILocalRolesAssignable, IExtFileStore, IPDF,47 IFileStoreNameChooser, IPasswordValidator, IUserAccount, I SIRPUtils)48 from waeup. sirp.interfaces import MessageFactory as _49 from waeup. sirp.permissions import get_users_with_local_roles50 from waeup. sirp.students.interfaces import IStudentsUtils51 from waeup. sirp.utils.helpers import string_from_bytes, file_size52 from waeup. sirp.widgets.datewidget import (43 from waeup.kofa.browser.pages import add_local_role, del_local_roles 44 from waeup.kofa.browser.resources import datepicker, tabs, datatable, warning 45 from waeup.kofa.interfaces import ( 46 IKOFAObject, ILocalRolesAssignable, IExtFileStore, IPDF, 47 IFileStoreNameChooser, IPasswordValidator, IUserAccount, IKOFAUtils) 48 from waeup.kofa.interfaces import MessageFactory as _ 49 from waeup.kofa.permissions import get_users_with_local_roles 50 from waeup.kofa.students.interfaces import IStudentsUtils 51 from waeup.kofa.utils.helpers import string_from_bytes, file_size 52 from waeup.kofa.widgets.datewidget import ( 53 53 FriendlyDateWidget, FriendlyDateDisplayWidget, 54 54 FriendlyDatetimeDisplayWidget) 55 from waeup. sirp.widgets.phonewidget import PhoneWidget56 from waeup. sirp.widgets.restwidget import ReSTDisplayWidget57 58 grok.context(I SIRPObject) # Make ISIRPObject the default context59 60 class ApplicantsRootPage( SIRPPage):55 from waeup.kofa.widgets.phonewidget import PhoneWidget 56 from waeup.kofa.widgets.restwidget import ReSTDisplayWidget 57 58 grok.context(IKOFAObject) # Make IKOFAObject the default context 59 60 class ApplicantsRootPage(KOFAPage): 61 61 grok.context(IApplicantsRoot) 62 62 grok.name('index') … … 70 70 return 71 71 72 class ApplicantsRootManageFormPage( SIRPEditFormPage):72 class ApplicantsRootManageFormPage(KOFAEditFormPage): 73 73 grok.context(IApplicantsRoot) 74 74 grok.name('manage') … … 141 141 return del_local_roles(self,3,**data) 142 142 143 class ApplicantsContainerAddFormPage( SIRPAddFormPage):143 class ApplicantsContainerAddFormPage(KOFAAddFormPage): 144 144 grok.context(IApplicantsRoot) 145 145 grok.require('waeup.manageApplication') … … 215 215 return self.context.p_id 216 216 217 class ApplicantsContainerPage( SIRPDisplayFormPage):217 class ApplicantsContainerPage(KOFADisplayFormPage): 218 218 """The standard view for regular applicant containers. 219 219 """ … … 232 232 @property 233 233 def introduction(self): 234 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE235 lang = self.request.cookies.get(' sirp.language', portal_language)234 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 235 lang = self.request.cookies.get('kofa.language', portal_language) 236 236 html = self.context.description_dict.get(lang,'') 237 237 if html =='': … … 246 246 return "%s" % self.context.title 247 247 248 class ApplicantsContainerManageFormPage( SIRPEditFormPage):248 class ApplicantsContainerManageFormPage(KOFAEditFormPage): 249 249 grok.context(IApplicantsContainer) 250 250 grok.name('manage') … … 349 349 return del_local_roles(self,3,**data) 350 350 351 class ApplicantAddFormPage( SIRPAddFormPage):351 class ApplicantAddFormPage(KOFAAddFormPage): 352 352 """Add-form to add an applicant. 353 353 """ … … 372 372 return 373 373 374 class ApplicantDisplayFormPage( SIRPDisplayFormPage):374 class ApplicantDisplayFormPage(KOFADisplayFormPage): 375 375 grok.context(IApplicant) 376 376 grok.name('index') … … 484 484 485 485 486 class OnlinePaymentDisplayFormPage( SIRPDisplayFormPage):486 class OnlinePaymentDisplayFormPage(KOFADisplayFormPage): 487 487 """ Page to view an online payment ticket 488 488 """ … … 524 524 self.context.p_state = 'paid' 525 525 self.context.payment_date = datetime.now() 526 ob_class = self.__implemented__.__name__.replace('waeup. sirp.','')526 ob_class = self.__implemented__.__name__.replace('waeup.kofa.','') 527 527 self.context.__parent__.loggerInfo( 528 528 ob_class, 'valid callback: %s' % self.context.p_id) … … 547 547 @property 548 548 def title(self): 549 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE550 return translate(_('Payment Data'), 'waeup. sirp',549 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 550 return translate(_('Payment Data'), 'waeup.kofa', 551 551 target_language=portal_language) 552 552 553 553 @property 554 554 def label(self): 555 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE555 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 556 556 return translate(_('Online Payment Receipt'), 557 'waeup. sirp', target_language=portal_language) \557 'waeup.kofa', target_language=portal_language) \ 558 558 + ' %s' % self.context.p_id 559 559 … … 582 582 #@property 583 583 #def label(self): 584 # portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE584 # portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 585 585 # container_title = self.context.__parent__.title 586 586 # label = translate('Application Record', 587 # 'waeup. sirp', target_language=portal_language)587 # 'waeup.kofa', target_language=portal_language) 588 588 # return container_title + label + self.context.application_number 589 589 … … 638 638 return True 639 639 640 class ApplicantManageFormPage( SIRPEditFormPage):640 class ApplicantManageFormPage(KOFAEditFormPage): 641 641 """A full edit view for applicant data. 642 642 """ … … 716 716 self.wf_info.fireTransition(trans_id) 717 717 self.flash(_('Form has been saved.')) 718 ob_class = self.__implemented__.__name__.replace('waeup. sirp.','')718 ob_class = self.__implemented__.__name__.replace('waeup.kofa.','') 719 719 if fields_string: 720 720 self.context.loggerInfo(ob_class, 'saved: % s' % fields_string) … … 748 748 self.flash(_('Successfully removed: ${a}', 749 749 mapping = {'a':', '.join(deleted)})) 750 ob_class = self.__implemented__.__name__.replace('waeup. sirp.','')750 ob_class = self.__implemented__.__name__.replace('waeup.kofa.','') 751 751 self.context.loggerInfo( 752 752 ob_class, 'removed: % s' % ', '.join(deleted)) … … 883 883 return image 884 884 885 class ApplicantRegistrationPage( SIRPAddFormPage):885 class ApplicantRegistrationPage(KOFAAddFormPage): 886 886 """Captcha'd registration page for applicants. 887 887 """ … … 926 926 self.applyData(applicant, **data) 927 927 self.context.addApplicant(applicant) 928 sirp_utils = getUtility(ISIRPUtils)929 password = sirp_utils.genPassword()928 kofa_utils = getUtility(IKOFAUtils) 929 password = kofa_utils.genPassword() 930 930 IUserAccount(applicant).setPassword(password) 931 931 # Send email with credentials 932 932 login_url = self.url(grok.getSite(), 'login') 933 933 msg = _('You have successfully been registered for the') 934 if sirp_utils.sendCredentials(IUserAccount(applicant),934 if kofa_utils.sendCredentials(IUserAccount(applicant), 935 935 password, login_url, msg): 936 936 self.redirect(self.url(self.context, 'registration_complete', … … 941 941 return 942 942 943 class ApplicantRegistrationEmailSent( SIRPPage):943 class ApplicantRegistrationEmailSent(KOFAPage): 944 944 """Landing page after successful registration. 945 945 """ -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt
r7714 r7811 11 11 <img src="" tal:attributes="src view/passport_url" /> 12 12 13 <table i18n:domain="waeup. sirp" class="form-table">13 <table i18n:domain="waeup.kofa" class="form-table"> 14 14 <tbody> 15 15 <tal:block repeat="widget view/widgets"> … … 41 41 </tbody> 42 42 </table> 43 <h3 i18n:domain="waeup. sirp" i18n:translate="">43 <h3 i18n:domain="waeup.kofa" i18n:translate=""> 44 44 Acceptance Fee Payment Tickets 45 45 </h3> 46 <table i18n:domain="waeup. sirp">46 <table i18n:domain="waeup.kofa"> 47 47 <thead> 48 48 <tr> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt
r7737 r7811 1 1 <form action="." tal:attributes="action request/URL" method="post" 2 i18n:domain="waeup. sirp" enctype="multipart/form-data">2 i18n:domain="waeup.kofa" enctype="multipart/form-data"> 3 3 4 4 <h2> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt
r7710 r7811 1 <div i18n:domain="waeup. sirp">1 <div i18n:domain="waeup.kofa"> 2 2 <p> 3 3 <span i18n:translate=""> An email with your user name and password … … 10 10 </p> 11 11 <p i18n:translate=""> 12 Thanks for using SIRP!12 Thanks for using Kofa! 13 13 </p> 14 14 </div> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantregister.pt
r7737 r7811 1 1 <form action="." tal:attributes="action request/URL" method="post" 2 i18n:domain="waeup. sirp" enctype="multipart/form-data">2 i18n:domain="waeup.kofa" enctype="multipart/form-data"> 3 3 4 4 <table class="form-table"> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt
r7737 r7811 1 1 <form action="." tal:attributes="action request/URL" method="POST" 2 i18n:domain="waeup. sirp" class="edit-form" enctype="multipart/form-data">2 i18n:domain="waeup.kofa" class="edit-form" enctype="multipart/form-data"> 3 3 4 4 <ul class="tabs" data-tabs="tabs"> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt
r7710 r7811 1 1 <form action="." tal:attributes="action request/URL" 2 i18n:domain="waeup. sirp" method="POST" enctype="multipart/form-data">2 i18n:domain="waeup.kofa" method="POST" enctype="multipart/form-data"> 3 3 <ul class="tabs" data-tabs="tabs"> 4 4 <li class="active"> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantsrootpage.pt
r7710 r7811 1 <table i18n:domain="waeup. sirp">1 <table i18n:domain="waeup.kofa"> 2 2 <thead> 3 3 <tr> … … 11 11 <tr tal:repeat="entry context/values" class="gradeC"> 12 12 <td tal:content="entry/year">Year 13 </td> 13 </td> 14 14 <td tal:content="entry/__name__">CODE 15 15 </td> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/container.py
r7800 r7811 23 23 from zope.component.factory import Factory 24 24 from zope.component.interfaces import IFactory 25 from waeup. sirp.applicants.interfaces import (25 from waeup.kofa.applicants.interfaces import ( 26 26 IApplicantsContainer, IApplicantsContainerAdd, 27 27 IApplicantsContainerProvider, IApplicant 28 28 ) 29 from waeup. sirp.utils.helpers import attrs_to_fields29 from waeup.kofa.utils.helpers import attrs_to_fields 30 30 31 31 def generate_applicant_id(container=None): … … 111 111 """ 112 112 grok.implements(IApplicantsContainerProvider) 113 grok.name('waeup. sirp.applicants.ApplicantsContainer')113 grok.name('waeup.kofa.applicants.ApplicantsContainer') 114 114 115 115 #: The applicants container type this provider provides: -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/dynamicroles.py
r7347 r7811 24 24 import grok 25 25 from zope.securitypolicy.interfaces import IPrincipalRoleManager 26 from waeup. sirp.applicants.interfaces import IApplicant27 from waeup. sirp.students.dynamicroles import StudentPrincipalRoleManager26 from waeup.kofa.applicants.interfaces import IApplicant 27 from waeup.kofa.students.dynamicroles import StudentPrincipalRoleManager 28 28 29 29 # All components in here have the same context: Applicant instances -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
r7795 r7811 27 27 from zope.schema.interfaces import ( 28 28 ValidationError, ISource, IContextSourceBinder) 29 from waeup. sirp.schema import TextLineChoice30 from waeup. sirp.interfaces import (31 I SIRPObject, year_range, validate_email, academic_sessions_vocab)32 from waeup. sirp.interfaces import MessageFactory as _33 from waeup. sirp.payments.interfaces import IOnlinePayment34 from waeup. sirp.schoolgrades import ResultEntryField35 from waeup. sirp.students.vocabularies import (29 from waeup.kofa.schema import TextLineChoice 30 from waeup.kofa.interfaces import ( 31 IKOFAObject, year_range, validate_email, academic_sessions_vocab) 32 from waeup.kofa.interfaces import MessageFactory as _ 33 from waeup.kofa.payments.interfaces import IOnlinePayment 34 from waeup.kofa.schoolgrades import ResultEntryField 35 from waeup.kofa.students.vocabularies import ( 36 36 lgas_vocab, CertificateSource, GenderSource) 37 from waeup. sirp.university.vocabularies import (37 from waeup.kofa.university.vocabularies import ( 38 38 course_levels, AppCatSource) 39 39 … … 178 178 pass 179 179 180 class IApplicantsRoot(I SIRPObject, IContainer):180 class IApplicantsRoot(IKOFAObject, IContainer): 181 181 """A container for university applicants containers. 182 182 """ 183 183 pass 184 184 185 class IApplicantsContainer(I SIRPObject):185 class IApplicantsContainer(IKOFAObject): 186 186 """An applicants container contains university applicants. 187 187 … … 352 352 'provider'].order = IApplicantsContainer['provider'].order 353 353 354 class IApplicantBaseData(I SIRPObject):354 class IApplicantBaseData(IKOFAObject): 355 355 """The data for an applicant. 356 356 … … 361 361 362 362 This base interface is also implemented by the 363 :class:`waeup. sirp.students.StudentApplication` class in the363 :class:`waeup.kofa.students.StudentApplication` class in the 364 364 students package. Thus, these are the data which are saved after 365 365 admission. … … 589 589 590 590 import grok 591 from waeup. sirp.applicants.interfaces import IApplicantsContainerProvider591 from waeup.kofa.applicants.interfaces import IApplicantsContainerProvider 592 592 593 593 class MyContainerProvider(grok.GlobalUtility): … … 601 601 602 602 >>> from zope.component import getAllUtilitiesRegisteredFor 603 >>> from waeup. sirp.applicants.interfaces import (603 >>> from waeup.kofa.applicants.interfaces import ( 604 604 ... IApplicantsContainerProvider) 605 605 >>> all_providers = getAllUtilitiesRegisteredFor( -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py
r7255 r7811 22 22 from zope.component.interfaces import IFactory 23 23 from zope.interface import implementedBy 24 from waeup. sirp.payments import OnlinePayment25 from waeup. sirp.applicants.interfaces import IApplicantOnlinePayment26 from waeup. sirp.utils.helpers import attrs_to_fields24 from waeup.kofa.payments import OnlinePayment 25 from waeup.kofa.applicants.interfaces import IApplicantOnlinePayment 26 from waeup.kofa.utils.helpers import attrs_to_fields 27 27 28 28 class ApplicantOnlinePayment(OnlinePayment): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/pdf.py
r7804 r7811 32 32 from zope.formlib.form import setUpEditWidgets 33 33 from zope.publisher.browser import TestRequest 34 from waeup. sirp.applicants.interfaces import IApplicant35 from waeup. sirp.browser import DEFAULT_PASSPORT_IMAGE_PATH36 from waeup. sirp.interfaces import IExtFileStore, IPDF, ISIRPUtils37 from waeup. sirp.interfaces import MessageFactory as _34 from waeup.kofa.applicants.interfaces import IApplicant 35 from waeup.kofa.browser import DEFAULT_PASSPORT_IMAGE_PATH 36 from waeup.kofa.interfaces import IExtFileStore, IPDF, IKOFAUtils 37 from waeup.kofa.interfaces import MessageFactory as _ 38 38 39 39 SLIP_STYLE = TableStyle( … … 54 54 def title(self): 55 55 container_title = self.context.__parent__.title 56 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE56 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 57 57 ar_translation = translate(_('Application Record'), 58 'waeup. sirp', target_language=portal_language)58 'waeup.kofa', target_language=portal_language) 59 59 return '%s - %s %s' % (container_title, 60 60 ar_translation, self.context.application_number) … … 107 107 if dept is None: 108 108 return data 109 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE109 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 110 110 dp_translation = translate(_('Department:'), 111 'waeup. sirp', target_language=portal_language)111 'waeup.kofa', target_language=portal_language) 112 112 f_label = '<font size=12>%s</font>' % dp_translation 113 113 f_text = '<font size=12>%s</font>' % dept.longtitle() … … 120 120 return data 121 121 fc_translation = translate(_('Faculty:'), 122 'waeup. sirp', target_language=portal_language)122 'waeup.kofa', target_language=portal_language) 123 123 f_label = '<font size=12>%s</font>' % fc_translation 124 124 f_text = '<font size=12>%s</font>' % faculty.longtitle() … … 145 145 pdf.setAuthor('%s (%s)' % (view.request.principal.title, 146 146 view.request.principal.id)) 147 pdf.setCreator(' SIRP')147 pdf.setCreator('KOFA') 148 148 width, height = A4 149 149 style = getSampleStyleSheet() … … 171 171 # Render widget fields 172 172 widgets = self._setUpWidgets() 173 portal_language = getUtility(I SIRPUtils).PORTAL_LANGUAGE173 portal_language = getUtility(IKOFAUtils).PORTAL_LANGUAGE 174 174 for widget in widgets: # self.widgets: 175 175 f_label = '<font size=12>%s</font>:' % translate( 176 widget.label.strip(), 'waeup. sirp',176 widget.label.strip(), 'waeup.kofa', 177 177 target_language=portal_language) 178 178 f_label = Paragraph(f_label, style["Normal"]) … … 184 184 data.append([f_label,f_text]) 185 185 adm_translation = translate(_('Admitted Course of Study:'), 186 'waeup. sirp', target_language=portal_language)186 'waeup.kofa', target_language=portal_language) 187 187 f_label = '<font size=12>%s</font>' % adm_translation 188 188 f_text = '<font size=12>%s</font>' % ( -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/root.py
r7652 r7811 23 23 from hurry.query.interfaces import IQuery 24 24 from zope.component import getUtility 25 from waeup. sirp.interfaces import ISIRPPluggable26 from waeup. sirp.applicants.interfaces import IApplicantsRoot27 from waeup. sirp.utils.logger import Logger25 from waeup.kofa.interfaces import IKOFAPluggable 26 from waeup.kofa.applicants.interfaces import IApplicantsRoot 27 from waeup.kofa.utils.logger import Logger 28 28 29 29 class ApplicantsRoot(grok.Container, Logger): … … 35 35 local_roles = [] 36 36 37 logger_name = 'waeup. sirp.${sitename}.applicants'37 logger_name = 'waeup.kofa.${sitename}.applicants' 38 38 logger_filename = 'applicants.log' 39 39 … … 46 46 47 47 class ApplicantsPlugin(grok.GlobalUtility): 48 """A SIRPPlugin that creates an applicants root in portal.48 """A KOFAPlugin that creates an applicants root in portal. 49 49 50 50 This plugin should be called by a typical 51 `waeup. sirp.app.Universtiy` instance on creation time. The51 `waeup.kofa.app.Universtiy` instance on creation time. The 52 52 :meth:`update` method normally can also be triggered manually over 53 53 the main site configuration. 54 54 55 Implements :class:`waeup. sirp.interfaces.ISIRPPluggable`55 Implements :class:`waeup.kofa.interfaces.IKOFAPluggable` 56 56 """ 57 57 grok.name('applicants') 58 grok.implements(I SIRPPluggable)58 grok.implements(IKOFAPluggable) 59 59 log_prefix = 'ApplicantsPlugin' 60 60 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/sample_container_data.csv
r6281 r7811 1 1 code,ac_prefix,application_category,provider,prefix,year 2 CODE1,APP,basic,waeup. sirp.applicants.ApplicantsContainer,app,20133 CODE2,DPP,cest,waeup. sirp.applicants.ApplicantsContainer,app,20132 CODE1,APP,basic,waeup.kofa.applicants.ApplicantsContainer,app,2013 3 CODE2,DPP,cest,waeup.kofa.applicants.ApplicantsContainer,app,2013 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py
r7321 r7811 26 26 from zope.interface import verify, implements 27 27 from zope.location.interfaces import ILocation 28 from waeup. sirp.image.interfaces import ISIRPImageFile29 from waeup. sirp.imagestorage import DefaultStorage30 from waeup. sirp.interfaces import IFileStoreHandler, IFileStoreNameChooser31 from waeup. sirp.applicants import (28 from waeup.kofa.image.interfaces import IKOFAImageFile 29 from waeup.kofa.imagestorage import DefaultStorage 30 from waeup.kofa.interfaces import IFileStoreHandler, IFileStoreNameChooser 31 from waeup.kofa.applicants import ( 32 32 Applicant, ApplicantFactory, 33 33 ApplicantImageStoreHandler, ApplicantImageNameChooser, 34 34 ) 35 from waeup. sirp.applicants.interfaces import IApplicant36 from waeup. sirp.testing import FunctionalTestCase, FunctionalLayer35 from waeup.kofa.applicants.interfaces import IApplicant 36 from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer 37 37 38 38 class FakeImageLocation(object): 39 39 implements(ILocation) 40 adapts(I SIRPImageFile)40 adapts(IKOFAImageFile) 41 41 def __init__(self, context): 42 42 pass -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py
r7421 r7811 22 22 from hurry.workflow.interfaces import IWorkflowInfo 23 23 from zope.component import getUtility 24 from waeup. sirp.testing import FunctionalLayer25 from waeup. sirp.interfaces import IExtFileStore, IFileStoreNameChooser26 from waeup. sirp.applicants.tests.test_browser import ApplicantsFullSetup24 from waeup.kofa.testing import FunctionalLayer 25 from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser 26 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup 27 27 28 28 class ApplicantCopierFunctionalTests(ApplicantsFullSetup): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_authentication.py
r7364 r7811 25 25 from zope.securitypolicy.role import Role 26 26 from zope.securitypolicy.interfaces import IRole, Allow 27 from waeup. sirp.authentication import get_principal_role_manager28 from waeup. sirp.interfaces import IAuthPluginUtility, IUserAccount29 from waeup. sirp.applicants.authentication import (27 from waeup.kofa.authentication import get_principal_role_manager 28 from waeup.kofa.interfaces import IAuthPluginUtility, IUserAccount 29 from waeup.kofa.applicants.authentication import ( 30 30 ApplicantsAuthenticatorSetup, ApplicantAccount) 31 from waeup. sirp.applicants.tests.test_browser import ApplicantsFullSetup32 from waeup. sirp.testing import FunctionalLayer31 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup 32 from waeup.kofa.testing import FunctionalLayer 33 33 34 34 class ApplicantsAuthenticatorSetupTests(unittest.TestCase): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py
r7509 r7811 27 27 from zope.interface.verify import verifyClass, verifyObject 28 28 29 from waeup. sirp.app import University30 from waeup. sirp.applicants.batching import (29 from waeup.kofa.app import University 30 from waeup.kofa.applicants.batching import ( 31 31 ApplicantsContainerImporter, ApplicantImporter) 32 from waeup. sirp.applicants.container import ApplicantsContainer33 from waeup. sirp.applicants.applicant import Applicant34 from waeup. sirp.university.faculty import Faculty35 from waeup. sirp.university.department import Department36 from waeup. sirp.testing import FunctionalLayer, FunctionalTestCase37 from waeup. sirp.interfaces import IBatchProcessor32 from waeup.kofa.applicants.container import ApplicantsContainer 33 from waeup.kofa.applicants.applicant import Applicant 34 from waeup.kofa.university.faculty import Faculty 35 from waeup.kofa.university.department import Department 36 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase 37 from waeup.kofa.interfaces import IBatchProcessor 38 38 39 39 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
r7795 r7811 29 29 from zope.testbrowser.testing import Browser 30 30 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState 31 from waeup. sirp.testing import FunctionalLayer, FunctionalTestCase32 from waeup. sirp.app import University33 from waeup. sirp.configuration import SessionConfiguration34 from waeup. sirp.applicants.container import ApplicantsContainer35 from waeup. sirp.applicants.applicant import Applicant36 from waeup. sirp.interfaces import (31 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase 32 from waeup.kofa.app import University 33 from waeup.kofa.configuration import SessionConfiguration 34 from waeup.kofa.applicants.container import ApplicantsContainer 35 from waeup.kofa.applicants.applicant import Applicant 36 from waeup.kofa.interfaces import ( 37 37 IExtFileStore, IFileStoreNameChooser, IUserAccount) 38 from waeup. sirp.university.faculty import Faculty39 from waeup. sirp.university.department import Department38 from waeup.kofa.university.faculty import Faculty 39 from waeup.kofa.university.department import Department 40 40 41 41 PH_LEN = 2059 # Length of placeholder file … … 247 247 self.browser.getControl(name="form.year").value = ['2010'] 248 248 self.browser.getControl(name="form.provider").value = [ 249 'waeup. sirp.applicants.ApplicantsContainer']249 'waeup.kofa.applicants.ApplicantsContainer'] 250 250 self.browser.getControl( 251 251 name="form.application_category").value = ['basic'] … … 262 262 self.browser.getControl(name="form.year").value = ['2010'] 263 263 self.browser.getControl(name="form.provider").value = [ 264 'waeup. sirp.applicants.ApplicantsContainer']264 'waeup.kofa.applicants.ApplicantsContainer'] 265 265 self.browser.getControl( 266 266 name="form.application_category").value = ['basic'] … … 277 277 self.browser.getControl(name="form.year").value = ['2010'] 278 278 self.browser.getControl(name="form.provider").value = [ 279 'waeup. sirp.applicants.ApplicantsContainer']279 'waeup.kofa.applicants.ApplicantsContainer'] 280 280 #self.browser.getControl(name="form.ac_prefix").value = ['APP'] 281 281 self.browser.getControl( -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_catalog.py
r7260 r7811 28 28 from zope.component.interfaces import ComponentLookupError 29 29 from zope.testbrowser.testing import Browser 30 from waeup. sirp.app import University31 from waeup. sirp.applicants.container import ApplicantsContainer32 from waeup. sirp.applicants.applicant import Applicant33 from waeup. sirp.testing import FunctionalLayer, FunctionalTestCase30 from waeup.kofa.app import University 31 from waeup.kofa.applicants.container import ApplicantsContainer 32 from waeup.kofa.applicants.applicant import Applicant 33 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase 34 34 35 35 class CatalogTests(FunctionalTestCase): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_container.py
r7193 r7811 21 21 import unittest 22 22 from zope.interface.verify import verifyClass, verifyObject 23 from waeup. sirp.applicants import interfaces24 from waeup. sirp.applicants.container import (23 from waeup.kofa.applicants import interfaces 24 from waeup.kofa.applicants.container import ( 25 25 ApplicantsContainer, 26 26 ) -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_dynamicroles.py
r7347 r7811 24 24 from zope.securitypolicy.tests.test_annotationprincipalrolemanager import ( 25 25 Test as APRMTest, Manageable) 26 from waeup. sirp.testing import FunctionalLayer27 from waeup. sirp.applicants.tests.test_browser import ApplicantsFullSetup28 from waeup. sirp.applicants import ApplicantPrincipalRoleManager26 from waeup.kofa.testing import FunctionalLayer 27 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup 28 from waeup.kofa.applicants import ApplicantPrincipalRoleManager 29 29 30 30 class ApplicantPrincipalRoleManagerTests(APRMTest): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_interfaces.py
r7683 r7811 22 22 from zc.sourcefactory.browser.source import FactoredTerms 23 23 from zope.publisher.browser import TestRequest 24 from waeup. sirp.applicants.interfaces import ApplicationTypeSource25 from waeup. sirp.students.vocabularies import GenderSource24 from waeup.kofa.applicants.interfaces import ApplicationTypeSource 25 from waeup.kofa.students.vocabularies import GenderSource 26 26 27 27 class InterfacesTest(unittest.TestCase): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_payment.py
r7250 r7811 20 20 """ 21 21 22 from waeup. sirp.testing import FunctionalLayer, FunctionalTestCase23 from waeup. sirp.applicants.payment import (22 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase 23 from waeup.kofa.applicants.payment import ( 24 24 ApplicantOnlinePayment, ApplicantOnlinePaymentFactory) 25 from waeup. sirp.payments.interfaces import IOnlinePayment25 from waeup.kofa.payments.interfaces import IOnlinePayment 26 26 27 27 class ApplicantOnlinePaymentFactoryTest(FunctionalTestCase): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_pdf.py
r7416 r7811 22 22 from zope.component import getAdapter 23 23 from zope.interface import verify 24 from waeup. sirp.applicants.pdf import IPDF, PDFApplicationSlip25 from waeup. sirp.applicants.tests.test_browser import ApplicantsFullSetup26 from waeup. sirp.interfaces import IPDF27 from waeup. sirp.testing import FunctionalTestCase, FunctionalLayer24 from waeup.kofa.applicants.pdf import IPDF, PDFApplicationSlip 25 from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup 26 from waeup.kofa.interfaces import IPDF 27 from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer 28 28 29 29 class PDFApplicationSlipTests(ApplicantsFullSetup): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_root.py
r7375 r7811 26 26 from zope.component.hooks import setSite, clearSite 27 27 from zope.interface.verify import verifyClass, verifyObject 28 from waeup. sirp.app import University29 from waeup. sirp.applicants import (28 from waeup.kofa.app import University 29 from waeup.kofa.applicants import ( 30 30 interfaces, Applicant, ApplicantsContainer, 31 31 ) 32 from waeup. sirp.applicants.root import (32 from waeup.kofa.applicants.root import ( 33 33 ApplicantsRoot, ApplicantsPlugin, 34 34 ) 35 from waeup. sirp.testing import (35 from waeup.kofa.testing import ( 36 36 FunctionalLayer, FunctionalTestCase, remove_logger) 37 37 … … 45 45 46 46 def setUp(self): 47 remove_logger('waeup. sirp.app.applicants')47 remove_logger('waeup.kofa.app.applicants') 48 48 super(ApplicantsRootTestCase, self).setUp() 49 49 # Setup a sample site for each test … … 79 79 logger = self.app['applicants'].logger 80 80 assert logger is not None 81 assert logger.name == 'waeup. sirp.app.applicants'81 assert logger.name == 'waeup.kofa.app.applicants' 82 82 handlers = logger.handlers 83 83 assert len(handlers) == 1 … … 93 93 logger = self.app['applicants'].logger 94 94 assert logger is not None 95 assert logger.name == 'waeup. sirp.app.applicants'95 assert logger.name == 'waeup.kofa.app.applicants' 96 96 handlers = logger.handlers 97 97 assert len(handlers) == 1 … … 103 103 def create_logger(self): 104 104 # create a logger suitable for local tests. 105 test_logger = logging.getLogger('waeup. sirp.applicants.testlogger')105 test_logger = logging.getLogger('waeup.kofa.applicants.testlogger') 106 106 log = StringIO() 107 107 handler = logging.StreamHandler(log) -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py
r7682 r7811 20 20 21 21 import grok 22 from waeup. sirp.applicants.interfaces import IApplicantsUtils22 from waeup.kofa.applicants.interfaces import IApplicantsUtils 23 23 24 24 class ApplicantsUtils(grok.GlobalUtility): -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py
r7714 r7811 18 18 import grok 19 19 from hurry.workflow.interfaces import IWorkflowState 20 from waeup. sirp.interfaces import ISIRPObject21 from waeup. sirp.students.viewlets import PrimaryStudentNavTab22 from waeup. sirp.browser.viewlets import ManageActionButton, PrimaryNavTab23 from waeup. sirp.applicants.interfaces import (20 from waeup.kofa.interfaces import IKOFAObject 21 from waeup.kofa.students.viewlets import PrimaryStudentNavTab 22 from waeup.kofa.browser.viewlets import ManageActionButton, PrimaryNavTab 23 from waeup.kofa.applicants.interfaces import ( 24 24 IApplicant, IApplicantsRoot, IApplicantsContainer, 25 25 IApplicantOnlinePayment, 26 26 ) 27 from waeup. sirp.applicants.browser import (27 from waeup.kofa.applicants.browser import ( 28 28 ApplicantsRootPage, ApplicantsContainerPage, ApplicantManageFormPage, 29 29 ApplicantDisplayFormPage, OnlinePaymentDisplayFormPage 30 30 ) 31 31 32 from waeup. sirp.interfaces import MessageFactory as _32 from waeup.kofa.interfaces import MessageFactory as _ 33 33 34 grok.context(I SIRPObject) # Make ISIRPObject the default context34 grok.context(IKOFAObject) # Make IKOFAObject the default context 35 35 grok.templatedir('browser_templates') 36 36 … … 38 38 """Applicants tab in primary navigation. 39 39 """ 40 grok.context(I SIRPObject)40 grok.context(IKOFAObject) 41 41 grok.order(3) 42 42 grok.require('waeup.viewApplicantsTab') -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/workflow.py
r7690 r7811 21 21 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition 22 22 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent 23 from waeup. sirp.applicants.interfaces import IApplicantBaseData24 from waeup. sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo, ISIRPUtils25 from waeup. sirp.interfaces import MessageFactory as _26 from waeup. sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo23 from waeup.kofa.applicants.interfaces import IApplicantBaseData 24 from waeup.kofa.interfaces import IObjectHistory, IKOFAWorkflowInfo, IKOFAUtils 25 from waeup.kofa.interfaces import MessageFactory as _ 26 from waeup.kofa.workflow import KOFAWorkflow, KOFAWorkflowInfo 27 27 28 28 INITIALIZED = 'initialized' … … 137 137 ) 138 138 139 application_workflow = SIRPWorkflow(APPLICATION_TRANSITIONS)139 application_workflow = KOFAWorkflow(APPLICATION_TRANSITIONS) 140 140 141 141 class ApplicationWorkflowState(WorkflowState, grok.Adapter): … … 148 148 state_id = 'wf.application.id' 149 149 150 class ApplicationWorkflowInfo( SIRPWorkflowInfo, grok.Adapter):150 class ApplicationWorkflowInfo(KOFAWorkflowInfo, grok.Adapter): 151 151 """Adapter to adapt Applicant objects to workflow info objects. 152 152 """ 153 153 grok.context(IApplicantBaseData) 154 grok.provides(I SIRPWorkflowInfo)154 grok.provides(IKOFAWorkflowInfo) 155 155 156 156 def __init__(self, context):
Note: See TracChangeset for help on using the changeset viewer.