SAK-22282 - Finish patch of SAK-22436 to fix issues with SAK-22282

When the patch for SAK-22436 was applied, the _group_error velocity template
was missed along with a few additional message properties.

Upon testing, it appears that SAK-25316 does not occur.



git-svn-id: https://source.sakaiproject.org/svn/assignment/trunk@133241 66ffb92e-73f9-0310-93c1-f5514f145a0a

assignment/assignment-bundles/resources/assignment.properties

@@ -112,6 +112,7 @@ gen.gra2          = Grade:
 gen.grade.override  = Override grade with:
 gen.grading				= Grading
 gen.group	 = Group
+gen.group	 = Groups
 gen.subformat = Select the format for student submission
 group.issubmit   = Are submissions for a group?
 gen.groupassignment	= Group Submission
@@ -123,6 +124,8 @@ group.user.multiple.warning = The following users are in more than one group eli
 group.must.member    = You must be a member of at least one group to submit!
 group.already.submitted = Group has already submitted!
 group.user.multiple.error  = At least one user is in more than one group.  Please see below.
+group.error.title          = User in multiple groups!
+group.error.message        = You or one of your group members are members of more than one group eligible to submit to this assignment.  Please inform your instructor that you will not be able to submit or view feedback until this error is resolved.
 group.user.duplicate.error = ERROR: This user is in more than one eligible group!
 group.user.grade.override = Grade override for {0}
 gen.history = History

assignment/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_student_view_group_error.vm

@@ -0,0 +1,90 @@
+<div class="portletBody">
+    #if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
+    <table class="itemSummary"  summary="$tlang.getString("gen.theassinf")">
+				<tr>
+					<th>
+						$tlang.getString("gen.title")
+					</th>
+					<td>
+                                        #if ($!assignment.isGroup() )
+                                           <span class="group_icon" title="$tlang.getString('gen.groupassignment')" alt="$tlang.getString('gen.groupassignment')"></span>
+                                        #else
+                                           <span class="user_icon" title="$tlang.getString('gen.userassignment')" alt="$tlang.getString('gen.userassignment')"></span>
+                                        #end
+						$validator.escapeHtml($assignment.getTitle())
+						#set ($deleted = false)
+						#set ($deleted = $assignment.getProperties().getProperty($assignment.getProperties().getNamePropAssignmentDeleted()))
+						#if ($!deleted.equalsIgnoreCase("true"))
+							<span class="highlight">(Assignment has been deleted)</span>
+						#end
+					</td>
+				</tr>
+				<tr>
+					<th>
+						$tlang.getString("gen.due")
+					</th>
+					<td>
+						$!assignment.getDueTime().toStringLocalFull()
+					</td>
+				</tr>
+                                <tr>
+						<th><span style="color: #B11;">$tlang.getString("group.error.title")</span></th>
+						<td>
+                                                    $tlang.getString("group.error.message")
+						</td>
+				</tr>
+
+
+        #if ($!assignment.isGroup())
+            <tr><th>$tlang.getString("gen.groups")</th><td>
+		#if ($!groups)
+                    #set ($size = 0)
+                    #set ($listDisplay="block")
+                                <table id="groupTable" style="width:80%;display:$listDisplay" class="listHier lines indnt3" border="0" cellpadding="0" cellspacing="0" summary="$tlang.getString('group.list.summary')">
+					#foreach ($group in $!groups)
+                                                #set ($size = $size + 1)
+						<tr>
+							<td headers="name" class="checkbox" style="white-space:nowrap">
+								<label for="id-$group.Id">
+									$validator.escapeHtml($group.Title)
+								</label>	
+							</td>
+                                                        <td headers="description" width="100%"> ##mozilla does not resize table children dynamically , so set here
+							<span style="font-size: smaller; color: blue;">	
+								#set($gusers = $assignmentService.getSortedGroupUsers($group))
+								#foreach ($user in $gusers)
+                                                                        ##if ($!alertMessage.indexOf($user.getDisplayName() > 0)
+                                                                        ##    <span style="color: #B11;">$user.getDisplayName()</span>
+                                                                        ##else
+                                                                            $user.getDisplayName()
+                                                                        ##end
+									#if ($velocityCount < $gusers.size()),#end
+								#end
+							</span>	
+                                                        #set($description = $group.Description)
+								<div style="font-size: smaller;">$validator.escapeHtml($!description)</div>
+							</td>
+						</tr>
+					#end
+                                        #if ($size == 0)
+                                                <tr><td colspan="2"><span class="highlight">$tlang.getString("group.must.member")</span></td></tr>
+                                        #end
+                                </table>
+                #else
+                            <span class="highlight">$tlang.getString("group.must.member")</span>              
+		#end
+                    </td></tr>
+            #end
+
+			</table>
+
+		<form action="#toolForm("AssignmentAction")" method="post" >
+			<div class="act">
+				<input type="submit" accesskey="x" name="eventSubmit_doCancel_view_grade" value="$tlang.getString("gen.backtolist")" accesskey="x" class="active TB_hideControl"/>
+			</div>
+			<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
+		</form>
+
+</div>
+
+