--- a/app/soc/views/models/grading_project_survey.py	Tue Aug 04 15:34:41 2009 +0200
+++ b/app/soc/views/models/grading_project_survey.py	Tue Aug 04 15:58:31 2009 +0200
@@ -55,7 +55,8 @@
     rights['edit'] = [('checkIsSurveyWritable', grading_survey_logic)]
     rights['delete'] = ['checkIsDeveloper'] # TODO: fix deletion of Surveys
     rights['list'] = ['checkDocumentList']
-    rights['results'] = [('checkIsSurveyWritable', grading_survey_logic)]
+    rights['record'] = ['checkIsDeveloper'] # TODO: proper access check
+    rights['results'] = ['checkIsDeveloper'] # TODO: proper access check
     rights['take'] = [('checkIsSurveyTakeable', grading_survey_logic),
                       ('checkIsAllowedToTakeProjectSurveyAs',
                        [grading_survey_logic, 'mentor', 'project'])]
@@ -221,6 +222,7 @@
 delete = decorators.view(view.delete)
 list = decorators.view(view.list)
 public = decorators.view(view.public)
+record = decorators.view(view.viewRecord)
 results = decorators.view(view.viewResults)
 send_reminder = decorators.view(view.sendReminder)
 take = decorators.view(view.take)

--- a/app/soc/views/models/project_survey.py	Tue Aug 04 15:34:41 2009 +0200
+++ b/app/soc/views/models/project_survey.py	Tue Aug 04 15:58:31 2009 +0200
@@ -53,7 +53,8 @@
     rights['edit'] = [('checkIsSurveyWritable', project_survey_logic)]
     rights['delete'] = ['checkIsDeveloper'] # TODO: fix deletion of Surveys
     rights['list'] = ['checkDocumentList']
-    rights['results'] = [('checkIsSurveyWritable', project_survey_logic)]
+    rights['record'] = ['checkIsDeveloper'] # TODO: proper access check
+    rights['results'] = ['checkIsDeveloper'] # TODO: proper access check
     rights['take'] = [('checkIsSurveyTakeable', project_survey_logic),
                       ('checkIsAllowedToTakeProjectSurveyAs',
                        [project_survey_logic, 'student', 'project'])]
@@ -224,7 +225,6 @@
 
     return self._list(request, student_project_params, contents, page_name)
 
-
   @decorators.merge_params
   @decorators.check_access
   def sendReminder(self, request, access_type, page_name=None,
@@ -274,6 +274,7 @@
 delete = decorators.view(view.delete)
 list = decorators.view(view.list)
 public = decorators.view(view.public)
+record = decorators.view(view.viewRecord)
 results = decorators.view(view.viewResults)
 send_reminder = decorators.view(view.sendReminder)
 take = decorators.view(view.take)

--- a/app/soc/views/models/survey.py	Tue Aug 04 15:34:41 2009 +0200
+++ b/app/soc/views/models/survey.py	Tue Aug 04 15:58:31 2009 +0200
@@ -106,7 +106,8 @@
     rights['delete'] = ['checkIsDeveloper'] # TODO: fix deletion of Surveys
     rights['list'] = ['checkDocumentList']
     rights['pick'] = ['checkDocumentPick']
-    rights['results'] = [('checkIsSurveyWritable', survey_logic)]
+    rights['record'] = ['checkIsDeveloper'] # TODO: proper access check
+    rights['results'] = ['checkIsDeveloper'] # TODO: proper access check
     rights['take'] = [('checkIsSurveyTakeable', survey_logic)]
 
     new_params = {}
@@ -123,6 +124,9 @@
          (r'^%(url_name)s/(?P<access_type>json)/%(scope)s$',
          'soc.views.models.%(module_name)s.json',
          'Export %(name)s as JSON'),
+        (r'^%(url_name)s/(?P<access_type>record)/%(key_fields)s$',
+         'soc.views.models.%(module_name)s.record',
+         'View survey record for %(name)s'),
         (r'^%(url_name)s/(?P<access_type>results)/%(key_fields)s$',
          'soc.views.models.%(module_name)s.results',
          'View survey results for %(name)s'),
@@ -142,9 +146,9 @@
     new_params['edit_template'] = 'soc/survey/edit.html'
     new_params['create_template'] = 'soc/survey/edit.html'
     new_params['public_template'] = 'soc/survey/public.html'
+    new_params['record_template'] = 'soc/survey/view_record.html'
     new_params['take_template'] = 'soc/survey/take.html'
 
-    # TODO: which one of these are leftovers from Document?
     new_params['no_create_raw'] = True
     new_params['no_create_with_scope'] = True
     new_params['no_create_with_key_fields'] = True
@@ -213,7 +217,6 @@
     survey_form = surveys.SurveyTakeForm(survey_content=entity.survey_content,
                                          survey_logic=self._params['logic'])
 
-    # TODO(ljvderijk) pose question about the getFields method name and working
     survey_form.getFields()
 
     context['survey_form'] = survey_form
@@ -671,10 +674,14 @@
     For params see base.View.public().
     """
 
-    survey_logic = params['logic']
+    # TODO(ljvderijk) finish this method
+    return http.HttpResponse("Work In Progress")
+
+    # TODO If read access then show all records, else show only mine +
+    # hook for subclasses. On both possibilities.
 
     try:
-      entity = survey_logic.getFromKeyFieldsOr404(kwargs)
+      entity = params['logic'].getFromKeyFieldsOr404(kwargs)
     except out_of_band.Error, error:
       return responses.errorResponse(
           error, request, template=params['error_public'])
@@ -685,36 +692,81 @@
     context['page_name'] = "%s titled '%s'" % (page_name, entity.title)
     context['entity'] = entity
 
-    results_logic = survey_logic.getRecordLogic()
+    results_logic = params['logic'].getRecordLogic()
 
-    user = user_logic.getForCurrentAccount()
+    # only show truncated preview of first answer
+    context['first_question'] = entity.survey_content.orderedProperties()[0]
 
-    context['properties'] = entity.survey_content.orderedProperties()
+    context['record_redirect'] = redirects.getSurveyRecordRedirect(
+        entity, params)
 
-    filter = self._params.get('filter') or {}
-
-    filter['survey'] = entity
+    filter = {'survey': entity}
 
     list_params = params.copy()
     list_params['list_description'] = \
-      'List of  %(name_plural)s.' % list_params
-
+      'List of %(name_plural)s.' % list_params
     list_params['logic'] = results_logic
-
-    valid_list = lists.getListContent(request, list_params, filter, idx=0)
+    list_params['list_heading'] = 'soc/survey/list/results_heading.html'
+    list_params['list_row'] = 'soc/survey/list/results_row.html'
 
-    valid_list['row'] = 'soc/survey/list/results_row.html'
-    valid_list['heading'] = 'soc/survey/list/results_heading.html'
-    valid_list['description'] = 'Survey Results:'
+    record_list = lists.getListContent(request, list_params, filter, idx=0)
 
-    contents = []
-    # fill contents with all the needed lists
-    contents.append(valid_list)
+    contents = [record_list]
 
     return self._list(request, list_params, contents, page_name, context)
 
   @decorators.merge_params
   @decorators.check_access
+  def viewRecord(self, request, access_type, page_name=None,
+                 params=None, **kwargs):
+    """View that allows the user to see the contents of a single SurveyRecord.
+
+    For params see base.View.public()
+    """
+
+    survey_logic = params['logic']
+    record_logic = survey_logic.getRecordLogic()
+
+    try:
+      survey_entity = survey_logic.getFromKeyFieldsOr404(kwargs)
+    except out_of_band.Error, error:
+      return responses.errorResponse(
+          error, request, template=params['error_public'])
+
+    get_dict = request.GET
+    record_id = get_dict.get('id')
+
+    if record_id and record_id.isdigit():
+      record_id = int(record_id)
+      record_entity = record_logic.getFromIDOr404(record_id)
+    else:
+      raise out_of_band.Error('No valid Record ID given')
+
+    if record_entity.survey.key() != survey_entity.key():
+      # record does not match the retrieved survey
+      raise out_of_band.Error('Record ID does not match the given survey')
+
+    # get the context for this webpage
+    context = responses.getUniversalContext(request)
+    responses.useJavaScript(context, params['js_uses_all'])
+    context['page_name'] = "%s titled '%s'" %(page_name, survey_entity.title)
+    context['entity'] = survey_entity
+    context['record'] = record_entity
+
+    # store the read only survey form in the context
+    survey_form = surveys.SurveyTakeForm(
+       survey_content=survey_entity.survey_content,
+       survey_record=record_entity,
+       survey_logic=self._params['logic'],
+       read_only=True)
+    survey_form.getFields()
+    context['survey_form'] = survey_form
+
+    template = params['record_template']
+    return responses.respond(request, template, context)
+
+  @decorators.merge_params
+  @decorators.check_access
   def exportSerialized(self, request, access_type, page_name=None,
                        params=None, **kwargs):
     """Exports Surveys in JSON format.
@@ -879,5 +931,6 @@
 list = decorators.view(view.list)
 public = decorators.view(view.public)
 pick = decorators.view(view.pick)
+record = decorators.view(view.viewRecord)
 results = decorators.view(view.viewResults)
 take = decorators.view(view.take)