Changeset 1781 for WAeUP_SRP/trunk/skins

Timestamp:

13 May 2007, 17:38:27 (17 years ago)

Author:

Henrik Bettermann

Message:

email and phone was not copied into application and personal after first login

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (2 diffs)
• waeup_student/getRetStudentStatistics.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -44 +44 @@
         student = getattr(students,str(member))
         student_app = getattr(student,'application',None)
-        if request.has_key('returning') and student_app is None:
+        student_per = getattr(student,'personal',None)
+        if request.has_key('returning') and  student_app is None:
             email=request.get("email")
             phone=request.get("phone_nr")
             context.waeup_tool.makeStudentData(str(member),
-                                               email=email,
-                                               phone_nr=phone,
-                                               )
-            d = {}
-            d['id'] = str(member)
-            d['email'] = email
-            d['phone'] = phone
-            context.students_catalog.modifyRecord(**d)
+                                                   email=email,
+                                                   phone_nr=phone,
+                                                   )
+            #d = {}
+            #d['id'] = str(member)
+            #d['email'] = email
+            #d['phone'] = phone
+            #context.students_catalog.modifyRecord(**d)
         elif student_app is None:
             context.waeup_tool.makeStudentData(str(member))
@@ -73 +74 @@
         logger.info('%s logged in, review_state %s' % (member,s_review_state))
         app_doc = student_app.getContent()
+        
+        if request.has_key('returning'):
+            email=request.get("email")
+            phone=request.get("phone_nr")        
+            # should be always closed, however ...
+            if a_review_state != 'opened':
+                wftool.doActionFor(student_app,'open')
+            # should be always opened after import, however ...
+            if p_review_state != 'opened':    
+                wftool.doActionFor(student_per,'open')
+            per_doc = student_per.getContent()
+            app_doc.edit(mapping = {'app_email' : email})
+            per_doc.edit(mapping = {'email' : email, 'phone' : phone})
+            wftool.doActionFor(student_app,'close')
+        
         #from Products.zdb import set_trace;set_trace()
         if load_passport and 'passport' not in app_doc.objectIds():

WAeUP_SRP/trunk/skins/waeup_student/getRetStudentStatistics.py

@@ -22 +22 @@
 entry_sessions = ('94','95','96','97','98','99','00','01','02','03','04','05')
 
-new_states =      ('returning',
+ret_states =      ('returning',
                    'school_fee_paid',
                    'courses_registered',
@@ -39 +39 @@
 res = context.students_catalog(entry_session = entry_sessions)
 dict['total'] = len(res)
-for state in new_states:
+for state in ret_states:
     res = context.students_catalog(entry_session = entry_sessions, review_state = state)
     dict[state] = len(res)
@@ -55 +55 @@
     res = context.students_catalog(entry_session = entry_sessions, faculty = f.getId)
     dict['total'] = len(res)
-    for state in new_states:
+    for state in ret_states:
         res = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state)
         dict[state] = len(res)