| Line 56... |
Line 56... |
| 56 |
formTips.tips.PreviousNonRippleVcsTag= newTip(-150, 20, 200, 10, 'PREVIOUS NON RIPPLE VCS TAG',
|
56 |
formTips.tips.PreviousNonRippleVcsTag= newTip(-150, 20, 200, 10, 'PREVIOUS NON RIPPLE VCS TAG',
|
| 57 |
'This is the vcs tag of the preceding significant (non-ripple) change that led to the current package version.'+
|
57 |
'This is the vcs tag of the preceding significant (non-ripple) change that led to the current package version.'+
|
| 58 |
'<br><br>NOTE:<br>Derivation of this has no sensitivity to the selected release.');
|
58 |
'<br><br>NOTE:<br>Derivation of this has no sensitivity to the selected release.');
|
| 59 |
formTips.tips.CreationHints= newTip(-150, 20, 200, 10, 'HINTS FOR PACKAGE CREATION',
|
59 |
formTips.tips.CreationHints= newTip(-150, 20, 200, 10, 'HINTS FOR PACKAGE CREATION',
|
| 60 |
'These are not correct commands. They are command hints to assist in creating a new package.');
|
60 |
'These are not correct commands. They are command hints to assist in creating a new package.');
|
| - |
|
61 |
formTips.tips.BuildOwner= newTip(-150, 20, 200, 10, 'BUILD OWNER',
|
| - |
|
62 |
'The Build Owner will be notified of Build Failures when a new package-version fails to build.' +
|
| - |
|
63 |
'<p>The Build Owner is set to the person who created the new version or who released the version to the build system by setting its state to Pending.');
|
| - |
|
64 |
|
| 61 |
|
65 |
|
| 62 |
|
66 |
|
| 63 |
</script>
|
67 |
</script>
|
| 64 |
<%
|
68 |
<%
|
| 65 |
'----------------------------------------------------------------------------------------------------------------------------------------
|
69 |
'----------------------------------------------------------------------------------------------------------------------------------------
|
| Line 820... |
Line 824... |
| 820 |
%>
|
824 |
%>
|
| 821 |
|
825 |
|
| 822 |
<tr>
|
826 |
<tr>
|
| 823 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
827 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
| 824 |
<% If bcan_unlock Then %>
|
828 |
<% If bcan_unlock Then %>
|
| 825 |
<a class='sublbox_txt' title='<%=stitle%>' href='<%=shref%>'> <b>Status:</b><img src='images/i_edit.gif' width='12' height='12' border='0' ></a>
|
829 |
<a class='sublbox_txt' title='<%=stitle%>' href='<%=shref%>'><b>Status:</b> <img src='images/i_edit.gif' width='12' height='12' border='0' align="absmiddle"></a>
|
| 826 |
<% Else %>
|
830 |
<% Else %>
|
| 827 |
<b>Status:</b><img src='images/i_edit_disable.gif' width='12' height='12' border='0' title='Cannot change status'>
|
831 |
<b>Status:</b><img src='images/i_edit_disable.gif' width='12' height='12' border='0' title='Cannot change status' align="absmiddle">
|
| 828 |
<% End If %>
|
832 |
<% End If %>
|
| 829 |
</td>
|
833 |
</td>
|
| 830 |
<td bgcolor=#f5f5f5 class="sublbox_txt"><%=sstate%></td>
|
834 |
<td bgcolor=#f5f5f5 class="sublbox_txt"><%=sstate%></td>
|
| 831 |
</tr>
|
835 |
</tr>
|
| 832 |
|
836 |
|
| Line 856... |
Line 860... |
| 856 |
</td>
|
860 |
</td>
|
| 857 |
</tr>
|
861 |
</tr>
|
| 858 |
<!-- Package Licence information -->
|
862 |
<!-- Package Licence information -->
|
| 859 |
<%
|
863 |
<%
|
| 860 |
Dim sonclick
|
864 |
Dim sonclick
|
| - |
|
865 |
Dim imgClass
|
| - |
|
866 |
Dim sClass
|
| 861 |
sonclick="MM_openVixIFrame('_wform_change_licence.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change License')"
|
867 |
sonclick="MM_openVixIFrame('_wform_change_licence.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change License')"
|
| 862 |
%>
|
868 |
%>
|
| 863 |
<tr>
|
869 |
<tr>
|
| 864 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
870 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
| 865 |
<%If canActionControlInProject ("EditPackageLicence") OR canActionControl("MSMaintainer") Then%>
|
871 |
<%If canActionControlInProject ("EditPackageLicence") OR canActionControl("MSMaintainer") Then%>
|
| 866 |
<a href='javascript:;' onClick="<%=sonclick%>" class='sublbox_txt'>
|
872 |
<a href='javascript:;' onClick="<%=sonclick%>" class='sublbox_txt'>
|
| 867 |
<b>Package Licence:</b>
|
873 |
<b>Package Licence:</b>
|
| 868 |
<img src='images/i_edit.gif' width='12' height='12' border='0'>
|
874 |
<img src='images/i_edit.gif' width='12' height='12' border='0' align="absmiddle">
|
| 869 |
</a>
|
875 |
</a>
|
| 870 |
<%Else%>
|
876 |
<%Else%>
|
| 871 |
<b>Package Licence:</b>
|
877 |
<b>Package Licence:</b>
|
| 872 |
<img src='images/i_edit_disable.gif' width='12' height='12' border='0'>
|
878 |
<img src='images/i_edit_disable.gif' width='12' height='12' border='0' align="absmiddle">
|
| 873 |
<%End If%>
|
879 |
<%End If%>
|
| 874 |
</td>
|
880 |
</td>
|
| 875 |
<td bgcolor=#f5f5f5 class="sublbox_txt">
|
881 |
<td bgcolor=#f5f5f5 class="sublbox_txt">
|
| 876 |
<%=getLicence()%>
|
882 |
<%=getLicence()%>
|
| 877 |
</td>
|
883 |
</td>
|
| 878 |
</tr>
|
884 |
</tr>
|
| 879 |
<%
|
885 |
<%
|
| 880 |
' Owner:
|
886 |
' Owner:
|
| - |
|
887 |
If objAccessControl.UserLogedIn() AND NOT pkgInfoHash.Item("is_sdkpkg") Then
|
| 881 |
sonclick="MM_openVixIFrame('_wform_change_owner.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change Owner')"
|
888 |
sonclick="MM_openVixIFrame('_wform_change_owner.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change Owner')"
|
| - |
|
889 |
imgClass = ""
|
| - |
|
890 |
sClass = "pointer"
|
| - |
|
891 |
Else
|
| - |
|
892 |
sonclick = ""
|
| - |
|
893 |
imgClass="lessOpacity"
|
| - |
|
894 |
sClass = ""
|
| - |
|
895 |
End If
|
| 882 |
%>
|
896 |
%>
|
| 883 |
|
897 |
|
| 884 |
<tr>
|
898 |
<tr class="sublbox_txt" >
|
| 885 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
899 |
<td nowrap bgcolor=#e4e9ec valign="top">
|
| 886 |
<%If objAccessControl.UserLogedIn() AND NOT pkgInfoHash.Item("is_sdkpkg") Then%>
|
- |
|
| 887 |
<a href='javascript:;' onClick="<%=sonclick%>" class='sublbox_txt'>
|
900 |
<span onClick="<%=sonclick%>" class='<%=sClass%>'>
|
| 888 |
<strong>Owner:</strong><img src='images/i_edit.gif' width='12' height='12' border='0' alt='Change owner'>
|
901 |
<strong>Build Owner: </strong><img src='images/i_edit.gif' width='12' height='12' border='0' class="<%=imgClass%>" title="Edit Build Owner" align="absmiddle">
|
| 889 |
</a>
|
- |
|
| 890 |
<%Else%>
|
902 |
</span>
|
| 891 |
<strong>Owner:</strong><img src='images/i_edit_disable.gif' width='12' height='12' border='0' alt='Change owner'>
|
- |
|
| 892 |
<%End If%>
|
903 |
<%=Quick_Help("BuildOwner")%>
|
| 893 |
</td>
|
904 |
</td>
|
| 894 |
<td bgcolor=#f5f5f5 class="sublbox_txt"><%=emailField(pkgInfoHash.Item ("owner"),pkgInfoHash.Item ("owner_email"))%></td>
|
905 |
<td bgcolor=#f5f5f5><%=emailField(pkgInfoHash.Item ("owner"),pkgInfoHash.Item ("owner_email"))%></td>
|
| 895 |
</tr>
|
906 |
</tr>
|
| 896 |
|
907 |
|
| 897 |
<%
|
908 |
<%
|
| 898 |
' Created:
|
909 |
' Created:
|
| 899 |
%>
|
910 |
%>
|
| Line 998... |
Line 1009... |
| 998 |
|
1009 |
|
| 999 |
<tr>
|
1010 |
<tr>
|
| 1000 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
1011 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top">
|
| 1001 |
<%If (pkgInfoHash.Item("can_edit_in_project") <> "1") OR (NOT objAccessControl.UserLogedIn) OR (NOT canActionInProject()) OR pkgInfoHash.Item("base_view_id") = "" Then %>
|
1012 |
<%If (pkgInfoHash.Item("can_edit_in_project") <> "1") OR (NOT objAccessControl.UserLogedIn) OR (NOT canActionInProject()) OR pkgInfoHash.Item("base_view_id") = "" Then %>
|
| 1002 |
<b>Base View:</b>
|
1013 |
<b>Base View:</b>
|
| 1003 |
<img src='images/i_edit_disable.gif' width='12' height='12' border='0'>
|
1014 |
<img src='images/i_edit_disable.gif' width='12' height='12' border='0' align="absmiddle">
|
| 1004 |
<%Else%>
|
1015 |
<%Else%>
|
| 1005 |
<%Dim bonclick : bonclick ="MM_openVixIFrame('_wform_change_group.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Set Package Base View')"%>
|
1016 |
<%Dim bonclick : bonclick ="MM_openVixIFrame('_wform_change_group.asp?pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Set Package Base View')"%>
|
| 1006 |
<a href='javascript:;' onClick="<%=bonclick%>" class='sublbox_txt'>
|
1017 |
<a href='javascript:;' onClick="<%=bonclick%>" class='sublbox_txt'>
|
| 1007 |
<b>Base View:</b>
|
1018 |
<b>Base View:</b>
|
| 1008 |
<img src='images/i_edit.gif' width='12' height='12' border='0'>
|
1019 |
<img src='images/i_edit.gif' width='12' height='12' border='0' align="absmiddle">
|
| 1009 |
</a>
|
1020 |
</a>
|
| 1010 |
<%End If%>
|
1021 |
<%End If%>
|
| 1011 |
</td>
|
1022 |
</td>
|
| 1012 |
<td bgcolor=#f5f5f5 class="sublbox_txt clip">
|
1023 |
<td bgcolor=#f5f5f5 class="sublbox_txt clip">
|
| - |
|
1024 |
<% Dim CleanView : CleanView = pkgInfoHash.Item("view_name")
|
| 1013 |
<%=Get_Pkg_Base_View ( parPv_id, parRtag_id )%>
|
1025 |
If CleanView = "" Then CleanView = "N/A"
|
| - |
|
1026 |
Response.Write CleanView
|
| - |
|
1027 |
%>
|
| 1014 |
</td>
|
1028 |
</td>
|
| 1015 |
</tr>
|
1029 |
</tr>
|
| 1016 |
|
1030 |
|
| 1017 |
<tr>
|
1031 |
<tr>
|
| 1018 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Following:</b><%=Quick_Help("following")%></td>
|
1032 |
<td nowrap bgcolor=#e4e9ec class="sublbox_txt" valign="top"><b>Following:</b><%=Quick_Help("following")%></td>
|
| Line 1103... |
Line 1117... |
| 1103 |
|
1117 |
|
| 1104 |
ElseIf IsNull(pkgInfoHash.Item ("is_patch")) Then
|
1118 |
ElseIf IsNull(pkgInfoHash.Item ("is_patch")) Then
|
| 1105 |
|
1119 |
|
| 1106 |
If canActionControlInProject("ChangePreviousVersion") AND NOT pkgInfoHash.Item("is_sdkpkg") Then
|
1120 |
If canActionControlInProject("ChangePreviousVersion") AND NOT pkgInfoHash.Item("is_sdkpkg") Then
|
| 1107 |
sonclick="MM_openVixIFrame('_wform_change_previous_version.asp?rfile="& scriptName &"&pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change Previous Version')"
|
1121 |
sonclick="MM_openVixIFrame('_wform_change_previous_version.asp?rfile="& scriptName &"&pv_id="& parPv_id &"&rtag_id="& parRtag_id &"','Change Previous Version')"
|
| 1108 |
PrevVerTitle = "<a href='javascript:;' onClick=""" & sonclick & """ class='sublbox_txt'> " & PrevVerTitle & " <img src='images/i_edit.gif' width='12' height='12' border='0' alt='Edit'></a>"
|
1122 |
PrevVerTitle = "<a href='javascript:;' onClick=""" & sonclick & """ class='sublbox_txt'> " & PrevVerTitle & " <img src='images/i_edit.gif' width='12' height='12' border='0' align='absmiddle'></a>"
|
| 1109 |
Else
|
1123 |
Else
|
| 1110 |
PrevVerTitle = PrevVerTitle & "<img src='images/i_edit_disable.gif' width='12' height='12' border='0' alt='Edit'>"
|
1124 |
PrevVerTitle = PrevVerTitle & "<img src='images/i_edit_disable.gif' width='12' height='12' border='0' align='absmiddle'>"
|
| 1111 |
End If
|
1125 |
End If
|
| 1112 |
Call DisplayVersionRow(pkgInfoHash.Item ("last_pv_id"), PrevVerTitle, "PreviousVcsTag")
|
1126 |
Call DisplayVersionRow(pkgInfoHash.Item ("last_pv_id"), PrevVerTitle, "PreviousVcsTag")
|
| 1113 |
|
1127 |
|
| 1114 |
Dim iLastSignificantPVID
|
1128 |
Dim iLastSignificantPVID
|
| 1115 |
Dim iRippleBasePVID
|
1129 |
Dim iRippleBasePVID
|
| Line 1583... |
Line 1597... |
| 1583 |
<%End If%>
|
1597 |
<%End If%>
|
| 1584 |
<%rsQryRipple.Close()
|
1598 |
<%rsQryRipple.Close()
|
| 1585 |
Set rsQryRipple = nothing%>
|
1599 |
Set rsQryRipple = nothing%>
|
| 1586 |
</tr>
|
1600 |
</tr>
|
| 1587 |
<%End If%>
|
1601 |
<%End If%>
|
| - |
|
1602 |
<%If pkgInfoHash.Item ("advisory_ripple") Then%>
|
| - |
|
1603 |
<tr class="sublbox_txt">
|
| - |
|
1604 |
<td width="20%" bgcolor=#e4e9ec>
|
| - |
|
1605 |
<strong>Advisory Ripple</strong>
|
| - |
|
1606 |
<%=Quick_Help ( "advisory_ripple" )%>
|
| - |
|
1607 |
</td>
|
| - |
|
1608 |
<td width="80%" bgcolor=#f5f5f5>
|
| - |
|
1609 |
Enabled
|
| - |
|
1610 |
</td>
|
| - |
|
1611 |
</tr>
|
| - |
|
1612 |
<%End If%>
|
| 1588 |
<tr>
|
1613 |
<tr>
|
| 1589 |
<td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
|
1614 |
<td width="20%" bgcolor=#e4e9ec class="sublbox_txt">
|
| 1590 |
<strong>Ripple Type</strong>
|
1615 |
<strong>Ripple Type</strong>
|
| 1591 |
<%=Quick_Help ( "ripple_type" )%>
|
1616 |
<%=Quick_Help ( "ripple_type" )%>
|
| 1592 |
</td>
|
1617 |
</td>
|
| Line 2508... |
Line 2533... |
| 2508 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
|
2533 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
|
| 2509 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=DisplayDate(rsCodeReviewURL("date_of_review"))%></td>
|
2534 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=DisplayDate(rsCodeReviewURL("date_of_review"))%></td>
|
| 2510 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=DisplayDate(rsCodeReviewURL("last_modified"))%></td>
|
2535 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=DisplayDate(rsCodeReviewURL("last_modified"))%></td>
|
| 2511 |
<%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
|
2536 |
<%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
|
| 2512 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="javascript:;" onclick="MM_openVixIFrame('_wform_edit_code_review_url.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','Edit Code Review URL')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
|
2537 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="javascript:;" onclick="MM_openVixIFrame('_wform_edit_code_review_url.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','Edit Code Review URL')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
|
| 2513 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>" onclick="return vixConfirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL"></a></td>
|
2538 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>" onclick="return vixConfirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL" align="absmiddle"></a></td>
|
| 2514 |
<%Else%>
|
2539 |
<%Else%>
|
| 2515 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
2540 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
| 2516 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
2541 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
| 2517 |
<%End If%>
|
2542 |
<%End If%>
|
| 2518 |
</tr>
|
2543 |
</tr>
|
| Line 2572... |
Line 2597... |
| 2572 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
|
2597 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
|
| 2573 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("date_of_review")%></td>
|
2598 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("date_of_review")%></td>
|
| 2574 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("last_modified")%></td>
|
2599 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><%=rsCodeReviewURL("last_modified")%></td>
|
| 2575 |
<%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (oldDlocked = "Y")) Then%>
|
2600 |
<%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (oldDlocked = "Y")) Then%>
|
| 2576 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="javascript:;" onclick="MM_openVixIFrame('_wform_edit_code_review_url.asp?pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','Edit Code Review URL')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
|
2601 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="javascript:;" onclick="MM_openVixIFrame('_wform_edit_code_review_url.asp?pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','Edit Code Review URL')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
|
| 2577 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>" onclick="return vixConfirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL"></a></td>
|
2602 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>" onclick="return vixConfirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL" align="absmiddle"></a></td>
|
| 2578 |
<%Else%>
|
2603 |
<%Else%>
|
| 2579 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
2604 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
| 2580 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
2605 |
<td bgcolor=#f5f5f5 class="form_item" valign="top"></td>
|
| 2581 |
<%End If%>
|
2606 |
<%End If%>
|
| 2582 |
</tr>
|
2607 |
</tr>
|