WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/form_add_pkg_versions.asp

 <!--#include file="common/conf.asp"-->
 <!--#include file="common/globals.asp"-->
 <!--#include file="common/formating.asp"-->
 <!--#include file="common/qstr.asp"-->
 <!--#include file="common/common_subs.asp"-->
-<!--#include file="_drawExtensionSelectBox.asp"-->
+<!--#include file="class/classSortHelper.asp"-->
 <%
 '------------ ACCESS CONTROL ------------------
 %>
 <!--#include file="_access_control_login.asp"-->
 Dim parBase_view_id
 Dim rsPkgs
 Dim HTML_pkg_list
 Dim parPv_id
 Dim parPkgfind
-Dim parIsNewPackage
 '------------ Constants Declaration -----------
 '------------ Variable Init -------------------
 parAdd_type = Request("add_type")
 parPkg_list = Request("pkg_list")
 parBase_view_id = Request("base_view_id")
 parPv_id = Request("pv_id")
 parPkgfind = Request("pkgfind")
-parIsNewPackage = Request("isNewPackage")
 Set pkgInfoHash = CreateObject("Scripting.Dictionary")
 '----------------------------------------------
 %>
 <%
 ' ---- Action requirements ----
                                             "&errmsg=true" )
 %>
 <%
 Function Page_Title ( NNadd_type )
    If NNadd_type = Cstr(enum_ADD_PACKAGES) Then
-      Page_Title = "ADD package"
+      Page_Title = "ADD Package"
    ElseIf NNadd_type = Cstr(enum_ADD_DEPENDENCIES) Then
-      Page_Title = "ADD dependency"
+      Page_Title = "ADD Dependency"
    ElseIf NNadd_type = Cstr(enum_ADD_RUNTIME_DEPENDENCIES) Then
       Page_Title = "ADD Runtime Dependency"
    Else
    Set rsTemp = nothing
 End Sub
 ' This function is used when adding packages to a release. The function processes a list of package ID's
-' and forms the HTML to display for each item, the name, base version, extension, and full version,
+' and forms the HTML to display for each item, the name, all available full versions in a list box
-' where the base version is an input text box, and the extension is a drop down list box.
 Sub Generate_Package_List ( NNpkg_list, SShtml_pkg_list, NNrtag_id, NNadd_type )
-   Dim rsPkgs, hidePatches, finalArg, currRsPkg, qparPkg_list
+   Dim rsPkgs, hidePatches, currRsPkg, qparPkg_list
-   Dim checkBoxId, spanPkgNameId, tdCheckBoxId
-   Dim fullVersion
-   Dim baseVersion
+   Dim spanPkgNameId
-   Dim extension
    Dim commonHTML
    hidePatches = "hidepatches=true&"
    If pkgInfoHash.Item ("is_patch") = "Y" Then hidePatches = ""
    Set rsPkgs = OraDatabase.DbCreateDynaset( Get_Pkg_Names( NNpkg_list, NNadd_type ), cint(0))
    While ((NOT rsPkgs.BOF) AND (NOT rsPkgs.EOF))
       currRsPkg = chr(34) & rsPkgs("pkg_id") & chr(34)
       qparPkg_list = chr(34) & parPkg_list & chr(34)
       ' Begin table row
       SShtml_pkg_list = SShtml_pkg_list &"<tr> "
       spanPkgNameId = "spanPkgName" & rsPkgs("pkg_id")
-      fullVersion = ""
-      baseVersion = ""
-      extension = ""
       ' Form package name
       SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>" _
                                         & "<span id='" & spanPkgNameId & "'>"& rsPkgs("pkg_name") &"</span></td>"
       ' setup some common html so that we can make the (full) Version field on the right-most column of the
       ' table row update on certain events taking place in the version base input box, and version extension
       ' drop down list box
-      commonHTML = rsPkgs("pkg_id") & "' onmouseout='updateVersion(" & currRsPkg & "," & qparPkg_list _
+      commonHTML = rsPkgs("pkg_id") & "'  onblur='updateVersion(" & currRsPkg & ");'" &_
-                                    & ");' onblur='updateVersion(" & currRsPkg & "," & qparPkg_list _
-                                    & ");' onclick='updateVersion(" & currRsPkg & "," & qparPkg_list _
-                                    & ");' onmouseup='updateVersion(" & currRsPkg & "," & qparPkg_list _
-                                    & ");' onchange='updateVersion(" & currRsPkg & "," & qparPkg_list _
+                                        " onchange='updateVersion(" & currRsPkg & ");'"
-                                    & ");' onkeyup='updateVersion(" & currRsPkg & "," & qparPkg_list & ");'"
-      ' Form the HTML for the version base input field
-      SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'>"_
-                                        &"<input type='text' style='visibility: visible' id='inputVersionBase"_
-                                        & commonHTML & " class='form_item' size='12' value='"& baseVersion &"'"
-      SShtml_pkg_list = SShtml_pkg_list & "> </td>"
-      ' Form the HTML for the version Extension drop down list
-      SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'> "_
-                                        & "<select style='visibility: visible' id='selectVersionExtension"_
-                                        & commonHTML & " id='selectExtension'"
-      SShtml_pkg_list = SShtml_pkg_list & "> "
+      SShtml_pkg_list = SShtml_pkg_list & "<td><select class='form_item' id='pkgn" & commonHTML & "name='pkgn" & rsPkgs("pkg_id") & "'>"
-      ' populate drop down with valid list of extensions
+      SShtml_pkg_list = SShtml_pkg_list & populateVersionList( rsPkgs("pkg_id") )
-      SShtml_pkg_list = SShtml_pkg_list & getExtensionSelectText(extension, false) ' getExtensionSelectText() is defined in _drawExtensionSelectBox.asp
+      SShtml_pkg_list = SShtml_pkg_list & "</select></td>"
-      SShtml_pkg_list = SShtml_pkg_list &"</select>"
-      If NNadd_type = Cstr(enum_ADD_RUNTIME_DEPENDENCIES) Then ' Runtime depencencies do not have constraints on pkg version
-         finalArg = "'R'"
-      Else ' Build dependencies have some format to follow
-         finalArg = "'RisVersionStr'"
-      End If
-      SShtml_pkg_list = SShtml_pkg_list  &"</td>"
-      ' Form the Use Existing Version checkbox
-      checkBoxId = "checkBoxExistingVersion" & rsPkgs("pkg_id")
-      tdCheckBoxId = "tdCheckBox" & rsPkgs("pkg_id")
-      SShtml_pkg_list = SShtml_pkg_list  &"<td id='"&tdCheckBoxID&"' background='images/bg_form_lightgray.gif'>"
-      SShtml_pkg_list = SShtml_pkg_list  &"<input type='checkBox' id='"&checkBoxId&"' onclick=""checkBoxChanged('" _
-                                       & rsPkgs("pkg_id") & "','" & rsPkgs("pkg_name") & "');"">"
       SShtml_pkg_list = SShtml_pkg_list  &"</td>"
-      ' Form the (full) Version display field
-      SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'>"
-      SShtml_pkg_list = SShtml_pkg_list &"<span nowrap class='form_item' name='spanFullVersion" & rsPkgs("pkg_id") _
-                                        & "' id='spanFullVersion" & rsPkgs("pkg_id") & "'> unset </span>"
-      SShtml_pkg_list = SShtml_pkg_list & "<input type='hidden'  id='pkgn" & rsPkgs("pkg_id") _
-                                        & "' name='pkgn" & rsPkgs("pkg_id") & "' ' class='form_item' size='12' value='" & fullVersion & "'> "
       ' End table row
       SShtml_pkg_list = SShtml_pkg_list  &"</tr>"
       rsPkgs.MoveNext
    WEnd
 End Sub
 ' This function deals with a PV_ID list, not a PKG_ID list. Hence, it is used for the ADD Dependencies user operation.
 ' The function was initially based on the Generate_Package_List() function, and then stripped back and reworked to use
 ' the result of the Get_Versions_From_Release() function, which now processes PV_ID lists also.
-' It does not display the base version or an extension drop down list box, like the Generate_Package_List() function,
-' because it is not needed. Adding a dependency means taking the latest version in the release, there is no choice about
+' Adding a dependency means taking the latest version in the release, there is no choice about  it.
-' it.
 Sub Generate_Version_List ( NNpv_id_list, SShtml_pkg_list, NNrtag_id, NNadd_type )
-   Dim finalArg
    Dim spanPkgNameId
    Dim fullVersion
    Dim i
    ' dictionaries and arrays
       ' Form package name
       SShtml_pkg_list = SShtml_pkg_list & " <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>" _
                                         & " <span id='" & spanPkgNameId & "'>"& pkg_names(i) &"</span></td>"
-      If NNadd_type = Cstr(enum_ADD_RUNTIME_DEPENDENCIES) Then ' Runtime depencencies do not have constraints on pkg version
-         finalArg = "'R'"
-      Else ' Build dependencies have some format to follow
-         finalArg = "'RisVersionStr'"
-      End If
       ' Form the (full) Version display field
       SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'>"
       If fullVersion = "" Then
          SShtml_pkg_list = SShtml_pkg_list &"<span nowrap class='form_item' name='spanFullVersion" & pkg_ids(i) _
       ' End table row
       SShtml_pkg_list = SShtml_pkg_list  &"</tr>"
    Next
 End Sub
+// Create HTML to populate a form selection with versions numbers for a specified
+// package. This could be done via AJAX but is currently done when the page is
+// rendered.
+Function populateVersionList(NNpkg_id)
+    Dim rsFind
+    Dim Query_String
+    Dim aVersions
+    Dim objSortHelper
+    Dim lastRow, i
+    // First one - Use as a prompt
+    populateVersionList = "<option>-- Select Version --</option>"
+    Query_String = _
+	" SELECT DISTINCT pv.pkg_version, pv.dlocked "&_
+	"    FROM PACKAGES pkg, package_versions pv"&_
+	"   WHERE pkg.pkg_id = pv.pkg_id  AND  pkg.pkg_id = " & NNpkg_id
+    Set rsFind = OraDatabase.DbCreateDynaset( Query_String, cint(0))
+	If rsFind.RecordCount > 0 Then
+		aVersions = rsFind.GetRows()
+		lastRow = UBound( aVersions, 2 )
+		Set objSortHelper = New SortHelper
+		' Sort versions
+		Call objSortHelper.VersionSort( aVersions, 0, lastRow, rsFind.FieldIndex("pkg_version") )
+		' Descending order
+		For i = lastRow To 0 Step -1
+            Dim prefix
+            Dim text
+            text = aVersions( rsFind.FieldIndex("pkg_version"), i )
+            If aVersions( rsFind.FieldIndex("dlocked"), i ) = "Y" Then
+                prefix = "R&nbsp;"
+            Else
+                prefix = "&nbsp;&nbsp;&nbsp;&nbsp;"
+            End If
+            populateVersionList = populateVersionList &_
+                "<option value='"& text &"'>" & prefix & text & "</option>"
+		Next
+		Set objSortHelper = nothing
+	End If
+	rsFind.Close
+	Set rsFind = nothing
+End Function
 %>
 <%
 If parPv_id <> "" Then
    Call Get_Pkg_Info ( parPv_id, NULL )
 <link rel="stylesheet" href="images/release_manager_style.css" type="text/css">
 <link rel="stylesheet" href="images/navigation.css" type="text/css">
 <script language="JavaScript" src="images/common.js"></script>
 <script language="JavaScript" type="text/JavaScript">
 <!--
-window.onload = function()
-{
-   if( !isNewPackage() )
-      return;
-   var packageIds = new Array();
-   {
-      <%
-      Dim rsPkgsTmp
-      Set rsPkgsTmp = OraDatabase.DbCreateDynaset( Get_Pkg_Names( parPkg_list, parAdd_type ), cint(0))
-      While ((NOT rsPkgsTmp.BOF) AND (NOT rsPkgsTmp.EOF))
-      %>
-         packageIds.push( "<%=rsPkgsTmp("pkg_id")%>" );
-         updateVersion("<%=rsPkgsTmp("pkg_id")%>", "<%=rsPkgsTmp("pkg_id")%>");
-      <%
-         rsPkgsTmp.MoveNext
-      Wend
-      rsPkgsTmp.Close()
-      %>
-   }
-   document.getElementById('tdUseExistingVersion').style.display = 'none';
-   document.getElementById('tdCheckBox' + packageIds[0]).style.display = 'none';
-}
-function isNewPackage()
+window.onload = function()
-{
-   if( "<%=parIsNewPackage%>" == "1" )
-      return true;
-   return false;
-}
-// checkBoxChanged is only called when adding packages to a release. It is not called when this form is
-// being used to add dependencies to a package version in a release.
-function checkBoxChanged( pkg_id, pkg_name )
+{
-   var checkBoxId = "checkBoxExistingVersion" + pkg_id;
+  checkSeletion(document.getElementById("base_view_id"));
-   var popupURL = "_wform_get_version.asp";
+   var versionObjectIds = getVersionObjectIds();
-   if( document.getElementById(checkBoxId).checked )
+   for( var iobj in versionObjectIds )
-   {
-      MM_openBrWindow( popupURL + "?pkg_id=" + pkg_id + "&pkg_name=" + pkg_name,"GetVersion","resizable=yes,width=400,height=400");
-      document.getElementById('inputVersionBase'       + pkg_id).style.visibility = "hidden";
-      document.getElementById('selectVersionExtension' + pkg_id).style.visibility = "hidden";
-   }
-   else
+   {
-      document.getElementById('inputVersionBase'       + pkg_id).style.visibility = "visible";
-      document.getElementById('selectVersionExtension' + pkg_id).style.visibility = "visible";
+      updateVersion(versionObjectIds[iobj]);
+   }
+}
-// getVersionObjectIds is only called when adding packages to a release. It is not called when this form is
+// getVersionObjectIds is only called when adding packages to a release.
-// being used to add dependencies to a package version in a release.
 function getVersionObjectIds ()
+{
    var versionObjectIds = new Array(); // Memory leak?
    <%
    Dim rsPkgs3, versionObjectId
    Set rsPkgs3 = OraDatabase.DbCreateDynaset( Get_Pkg_Names( parPkg_list, parAdd_type ), cint(0))
    While ((NOT rsPkgs3.BOF) AND (NOT rsPkgs3.EOF))
-      versionObjectId = "pkgn" & rsPkgs3("pkg_id")
+      versionObjectId = rsPkgs3("pkg_id")
       %>
       versionObjectIds.push( "<%=versionObjectId%>" );
       <%
       rsPkgs3.MoveNext
    Wend
    %>
    return versionObjectIds;
+}
-// CheckVersion is only called when adding packages to a release. It is not called when this form is
+// CheckVersion is only called when adding packages to a release.
+// Called before the form is submitted. Can validate the form
-// being used to add dependencies to a package version in a release.
+// Simply tests that all required fields have been entered
 function checkVersion ()
+{
-   var versionObjectIds = new Array();
+   var isValid = checkSeletion(document.getElementById("base_view_id"));
-   versionObjectIds = getVersionObjectIds();
+   var versionObjectIds = getVersionObjectIds();
    for( var iobj in versionObjectIds )
+   {
-      var checkBoxId = versionObjectIds[iobj].replace( /pkgn/, "checkBoxExistingVersion");
-      var spanPkgNameId = versionObjectIds[iobj].replace( /pkgn/, "spanPkgName");
+      if (updateVersion(versionObjectIds[iobj]))
-      var pkgName = document.getElementById(spanPkgNameId).innerHTML;
+        continue;
-      var fullVersion = document.getElementById(versionObjectIds[iobj]).value;
-      var versionBase = fullVersion.replace( /(.*)(\..*)/, "$1");
-      var versionExt =  fullVersion.replace( /(.*)(\..*)/, "$2");
-      var isAutobuild = document.getElementById(checkBoxId).checked;
-      var isValid = MM_ValidateVersion(pkgName, versionBase, versionExt, isAutobuild, false);
-      if (isValid)
+      isValid = false;
-      {
-         continue;
-      }
+      break;
-      // failed - exit function, returning false for the form.
-      document.MM_returnValue = false;
-      document.getElementById("ProgressBar").style.visibility = "hidden";
-      return false;
+   }
-   return true;
-}
-//-----------------------------------------------------------------------------------------------------------------------------
-// Javascript Function: updateFields
-//
-// Purpose: This is a function that is called by external javascript to updates fields in form
-//
-// Arguments: myPkgId (integer) - Package number
-// myPv_id (integer) - package version number (not used in form_add_pkg_versions.asp implementation of this function)
-// newVersion (string) - output value of the external javascript.  This is the new version
-// cancelled (boolean) - true if user cancelled popup, else false
-//
-// Returns: nothing
-//
-// Notes: this is called by the popup window coded in _wform_get_version.asp when the user clicks 'submit' in that popup window.  An equivalent function also
-// exists in form_edit_deps.asp for when it activates the code in _wform_get_version.asp.
-function updateFields( myPv_id, myPkgId, newVersion, cancelled )
-{
-   // if user is cancelling the popup, or if the version we have got from the popup is empty...
-   if (cancelled || newVersion == "")
-   {
-      // uncheck the "Use Existing Version" checkbox, and re-enable the version number and extension inputs
-      var checkBoxId = "checkBoxExistingVersion" + myPkgId;
-      document.getElementById(checkBoxId).checked = false;
+   if (isValid) {
-      document.getElementById('inputVersionBase'       + myPkgId).style.visibility = "visible";
-      document.getElementById('selectVersionExtension' + myPkgId).style.visibility = "visible";
+    MM_showProgressBar();
+   }
    else
+   {
-      // Note here we use myPkgId as the spanFullVersion span is associated with a pkg_id rather than a pv_id
+      // failed - exit function, returning false for the form.
-      document.getElementById('spanFullVersion' + myPkgId).innerHTML = newVersion;
+      document.MM_returnValue = false;
-       var fullVersion = document.getElementById('spanFullVersion' + myPkgId).innerHTML;
-      var versionBase = fullVersion.replace( /(.*)\..*/, "$1");
+      MM_hideProgressBar();
-      var versionExt = fullVersion.replace( /(.*)\./, ".");
+      alert ("Complete all selections");
-      document.getElementById('inputVersionBase' + myPkgId).value = versionBase;
-      document.getElementById('selectVersionExtension' + myPkgId).value = versionExt;
-      document.getElementById('pkgn' + myPkgId).value = fullVersion;
+      return false;
+   }
+   return true;
+}
-// updateVersion is only called when adding packages to a release. It is not called when this form is
+// updateVersion is only called when adding packages to a release.
-// being used to add dependencies to a package version in a release.
 function updateVersion( myPkgId, myParPkg_list )
+{
-   document.getElementById("spanFullVersion" + myPkgId).innerHTML =
-   document.getElementById("inputVersionBase"       + myPkgId).value +
-   document.getElementById("selectVersionExtension" + myPkgId).value;
-   document.getElementById("pkgn"                   + myPkgId).value =
+    return checkSeletion(document.getElementById("pkgn" + myPkgId));
-   document.getElementById("inputVersionBase"       + myPkgId).value +
-   document.getElementById("selectVersionExtension" + myPkgId).value;
+}
 //-->
 </script>
 <!-- DROPDOWN MENUS -->
                                  <tr>
                                     <td colspan="2" width="1%" nowrap class="form_field" background="images/bg_form_lightbluedark.gif">To Base View</td>
                                  </tr>
                                  <tr>
                                     <td colspan="2" width="1%" nowrap background="images/bg_form_lightgray.gif">
-                                       <select name="base_view_id" id="base_view_id" class="form_item">
+                                       <select name="base_view_id" id="base_view_id" class="form_item" onblur="checkSeletion(this);" onchange="checkSeletion(this);">
                                           <option></option>
                                           <%Call Get_All_Base_Views( parBase_view_id, parPkg_list )%>
                                        </select>
                                        <br>
                                     <table width="100%" border="0" cellspacing="1" cellpadding="2">
                                        <tr>
                                           <td background="images/bg_form_lightbluedark.gif" nowrap width="10%" class="form_field">Package Name
                                              <img src="images/h_trsp_dot.gif" width="1" height="20" align="absmiddle">
                                           </td>
-                                          <% 'Do not display the VersionBase, VersionExtension, and Use Existing Version columns if we are adding dependencies
+                                          <td background="images/bg_form_lightbluedark.gif" nowrap width="40%" class="form_field">Version
-                                          If parAdd_type <> Cstr(enum_ADD_DEPENDENCIES) AND parAdd_type <> Cstr(enum_ADD_RUNTIME_DEPENDENCIES) Then%>
+                                          <%If parAdd_type <> Cstr(enum_ADD_DEPENDENCIES) AND parAdd_type <> Cstr(enum_ADD_RUNTIME_DEPENDENCIES) Then%>
-                                             <td background="images/bg_form_lightbluedark.gif" nowrap width="10%" class="form_field">Version Base</td>
-                                             <td background="images/bg_form_lightbluedark.gif" nowrap width="10%" class="form_field">Version Extension</td>
-                                             <td id='tdUseExistingVersion' background="images/bg_form_lightbluedark.gif" nowrap class="form_field" width="30%">
-                                                Use Existing Version
-                                                <a onmouseout="formTips.hide()" onmouseover="formTips.show('existingVersion')" href="javascript:;">
+                                            <a onmouseout="formTips.hide()" onmouseover="formTips.show('existingVersion')" href="javascript:;">
-                                                   <img width="12" hspace="2" height="12" border="0" align="absmiddle" src="images/i_help.gif" />
+                                               <img width="12" hspace="2" height="12" border="0" align="absmiddle" src="images/i_help.gif" />
-                                                </a>
-                                             </td>
+                                            </a>
                                           <%End If%>
-                                          <td background="images/bg_form_lightbluedark.gif" nowrap width="40%" class="form_field">Version</td>
+                                          </td>
                                        </tr>
                                        <%=HTML_pkg_list%>
                                        <tr>
                                           <td nowrap><img src="images/h_trsp_dot.gif" width="120" height="1"></td>
                                           <td></td>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/form_add_pkg_versions.asp @ 5054 – Rev 133 → 3959