WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/wAddDaemonInstruction.asp

 parPv_id = Request("pv_id")
 parRepeat = Request("repeat")
 parInst_id = Request("inst_id")
 parSchDateTime = Request("sdt")
 parRfile = Request("rfile")
+parSortOrder = RequestDefault("sort",0)
+If parSchDateTime = "" Then
+   parSchDateTime = DisplayShortDateTimeSecs(Now())
+End If
 ReleaseMode = GetReleaseMode(parRtag_id)
 parSortOrder = Request("sort")
 If IsNull(parSortOrder) OR parSortOrder = "" Then
    parSortOrder = "0"
 End If
 Set objFormCollector = CreateObject("Scripting.Dictionary")
 '------------------------------------------------------------------------------------------------------------------------------------------
+'
 ' Add a line of text to the System Message
+'
 Sub sMessageAdd(eLevel, text)
 Function Get_OpCodes ( NNop_code )
    Dim op_code_str_array
    Dim op_code_str
    Dim op_code_val
 	Dim selectedFound
-   Dim tempLINK
    Dim s
    selectedFound = False
    ' Get the op-codes in terms of human readable string names - these will be used in the drop down select list
    Call GetDaemonInstructionOperationNameArray(op_code_str_array)
    s = "<td width='20%' align='left' class='nowrap'>Operation</td>"
-   s = s + "<td align='left'><select name='op_code_list' id='op_code_list' class='form_item' onchange=""MM_jumpMenu('document',this,0)"">"
+   s = s + "<td align='left'><select name='op_code' id='op_code' class='form_item' onchange='Refresh_Page()'>"
    For each op_code_str in op_code_str_array
       ' get equivalent op-code value for this op-code string
       op_code_val = DaemonInstructionOperationValue(op_code_str)
-      tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& op_code_val &_
-                              "&rtag_id=" & parRtag_id &_
-                              "&pv_id=" & parPv_id &_
-                              "&sort=" & parSortOrder &_
-                              "&sdt="& parSchDateTime &_
-                              "&repeat="& parRepeat &_
-                              "&rfile="& parRfile
       If ((NNop_code = op_code_val) OR (NNop_code = "0")) AND (selectedFound = False) Then
-         s = s + "<option value='"& tempLINK &"' selected>"& op_code_str &"</option>"
+         s = s + "<option value='"& op_code_val &"' selected>"& op_code_str &"</option>"
          selectedFound = True
          NNop_code = op_code_val
       Else
-         s = s + "<option value='"& tempLINK &"'>"& op_code_str &"</option>"
+         s = s + "<option value='"& op_code_val &"'>"& op_code_str &"</option>"
       End If
    Next
    s = s + "</select></td>"
    Get_OpCodes = s
 ' Formulate the HTML for a combo box listing all the Projects, and select the one that matches
 ' the proj-id passed in as a parameter. If the parameter value could not be found, correct it to the first valid proj-id
 ' in the list.
 '------------------------------------------------------------------------------------------------------------------------------------------
 Function Get_Projects ( NNproj_id )
-   Dim rsTemp, Query_String, projName, tempLINK, selectedFound, s
+   Dim rsTemp, Query_String, projName, selectedFound, s
    selectedFound = False
    Query_String = "SELECT * FROM projects ORDER BY  UPPER( proj_name )"
    Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
    s = "<td class='nowrap'>Project</td>"
-   s = s + "<td><select id='proj_id_list' name='proj_id_list' class='form_item' onChange=""MM_jumpMenu('document',this,0)"">"
+   s = s + "<td><select id='proj_id' name='proj_id' class='form_item' onChange='Refresh_Page()'>"
+   If NNproj_id <= 0 Then
+        s = s + "<option value='0' disabled selected>Select Project</option>"
+   End If
    While ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF))
       projName = UCase(rsTemp.Fields("proj_name"))
-      tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& parOp_code &_
-                              "&proj_id=" & rsTemp.Fields("proj_id") &_
-                              "&sdt="& parSchDateTime &_
-                              "&repeat="& parRepeat &_
-                              "&sort=" & parSortOrder &_
-                              "&rfile="& parRfile
-      If ((NNproj_id = Cstr(rsTemp.Fields("proj_id"))) OR (NNproj_id = "0")) AND (selectedFound = False) Then
+      If (Cstr(NNproj_id) = Cstr(rsTemp.Fields("proj_id"))) AND (selectedFound = False) Then
-         s = s + "<option value='"& tempLINK &"' selected>"& projName &"</option>"
+         s = s + "<option value='"& Cstr(rsTemp.Fields("proj_id")) &"' selected>"& projName &"</option>"
          selectedFound = True
          NNproj_id = CStr(rsTemp.Fields("proj_id"))
       Else
-         s = s + "<option value='"& tempLINK &"'>"& projName &"</option>"
+         s = s + "<option value='"& Cstr(rsTemp.Fields("proj_id")) &"'>"& projName &"</option>"
       End If
       rsTemp.MoveNext
    WEnd
    s = s + "</select>"
-   ' Correct for a situation where selectedFound is still FALSE.
-   If NOT selectedFound Then
-      rsTemp.MoveFirst
-      If ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF)) Then
-         NNproj_id = CStr(rsTemp.Fields("proj_id"))
-      Else
-         NNproj_id = "0"
-      End If
-   End If
    rsTemp.Close
    Set rsTemp = nothing
    s = s + "</td>"
 ' Formulate the HTML for a combo box listing all the Release for a specified project, and select the one that matches
 ' the release-tag passed in as a parameter. If the parameter value could not be found, correct it to the first valid release-tag
 ' in the list.
 '------------------------------------------------------------------------------------------------------------------------------------------
 Function Get_Releases ( NNproj_id, NNrtag_id )
-   Dim rsTemp, Query_String, releaseName, tempLINK, selectedFound, s, numReleases
+   Dim rsTemp, Query_String, releaseName, val, selectedFound, s, numReleases
    selectedFound = False
    numReleases = 0
    Query_String = "SELECT rtag_id, rtag_name "&_
                   "  FROM release_tags rt"&_
                   " WHERE rt.proj_id = "& NNproj_id &_
                   "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
                   " ORDER BY UPPER(rtag_name)"
 	Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
    s = "<td class='nowrap'>Release</td>"
-   s = s + "<td><select id='rtag_id_list' name='rtag_id_list' class='form_item' onChange=""MM_jumpMenu('document',this,0)"">"
+   s = s + "<td><select id='rtag_id' name='rtag' class='form_item' onChange='Refresh_Page()'>"
+   If NNrtag_id <= 0 Then
+        s = s + "<option value='0' disabled selected>Select Release</option>"
+   End If
    While ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF))
       releaseName = rsTemp.Fields("rtag_name")
+      val = CStr(rsTemp.Fields("rtag_id"))
-      tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& parOp_code &_
-                              "&proj_id="& NNproj_id &_
-                              "&rtag_id="& rsTemp.Fields("rtag_id") &_
-                              "&sdt="& parSchDateTime &_
-                              "&repeat="& parRepeat &_
-                              "&sort=" & parSortOrder &_
-                              "&rfile="& parRfile
-      If ((NNrtag_id = CStr(rsTemp.Fields("rtag_id"))) OR (NNrtag_id = "0")) AND (selectedFound = False) Then
+      If ((Cstr(NNrtag_id) = val)  AND selectedFound = False) Then
-            s = s + "<option value='"& tempLINK &"' selected>"& releaseName &"</option>"
+            s = s + "<option value='"& val &"' selected>"& releaseName &"</option>"
          selectedFound = True
-         NNrtag_id = Cstr(rsTemp.Fields("rtag_id"))
+         NNrtag_id = val
       Else
-         s = s + "<option value='"& tempLINK &"'>"& releaseName &"</option>"
+         s = s + "<option value='"& val  &"'>"& releaseName &"</option>"
       End If
       numReleases = numReleases + 1
       rsTemp.MoveNext
    WEnd
    s = s + "</select>"
-   ' Correct for a situation where selectedFound is still FALSE.
-   If NOT selectedFound Then
-      rsTemp.MoveFirst
-      If ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF)) Then
-         NNrtag_id = CStr(rsTemp.Fields("rtag_id"))
-      Else
-         NNrtag_id = "0"
-      End If
-   End If
    ' If no releases were found then replace drop down list with some warning text and disable form submission
    If numReleases = 0 Then
       bPreventSubmit = True
+      s = "<td class='nowrap'>Release</td>"
+      If NNproj_id > 0 Then
-      s = "<td class='nowrap'>Release</td><td><a style=color:Red>WARNING: No active releases found. The operation cannot be performed.</a></td>"
+        s = s + "<td><a style=color:Red>WARNING: No active releases found. The operation cannot be performed.</a></td>"
+      End If
    Else
       ' If the selected release does not have a daemon configuration, append some warning text to the right of the drop down list.
-      If DaemonsAvailable(NNrtag_id) = False Then
+      If NNrtag_id > 0 AND DaemonsAvailable(NNrtag_id) = False Then
-         s = s + "<a style=color:Red>WARNING: Release has no build daemon(s)</a>"
+         s = s + "<br><a style=color:Red>WARNING: Release has no build daemon(s)</a>"
       End If
    End If
    rsTemp.Close
    Set rsTemp = nothing
 ' This function must deal with op-codes that want to read package versions from the work_in_progress table, and op-codes
 ' that need to read package versions from the release_content table.
 ' The function should only be called if a package versions drop down list is required for the form.
 '------------------------------------------------------------------------------------------------------------------------------------------
 Function Get_Packages ( NNrtag_id, NNpv_id, NNop_code )
-   Dim rsTemp, Query_String, pkgName, tempLINK, selectedFound, s, numPackages
+   Dim rsTemp, Query_String, pkgName, val, selectedFound, s, numPackages
    selectedFound = False
    numPackages = 0
       s = "<td class='nowrap'>WIP Package</td>"
    Else
       s = "<td class='nowrap'>Released Package</td>"
    End If
-   s = s + "<td><select id='pv_id_list' name='pv_id_list' class='form_item' onChange=""MM_jumpMenu('document',this,0)"">"
+   s = s + "<td><select id='pv_id' name='pv_id' class='form_item' onchange='Refresh_Page()'>"
+   If NNpv_id <= 0 Then
+        s = s + "<option value='0' disabled selected>Select Package</option>"
+   End If
    While ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF))
       pkgName = rsTemp.Fields("pkg_name") & " " & rsTemp.Fields("pkg_version")
+      val = rsTemp.Fields("pv_id")
-      tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& NNop_code &_
-                              "&proj_id="& parProj_id &_
-                              "&rtag_id="& NNrtag_id &_
-                              "&pv_id="&   rsTemp.Fields("pv_id") &_
-                              "&sdt="& parSchDateTime &_
-                              "&repeat="& parRepeat &_
-                              "&sort=" & parSortOrder &_
-                              "&rfile="& parRfile
-      If ((NNpv_id = Cstr(rsTemp.Fields("pv_id"))) OR (NNpv_id = "0")) AND (selectedFound = False) Then
+      If ((NNpv_id = val) AND selectedFound = False) Then
-         s = s + "<option value='"& tempLINK &"' selected>"& pkgName &"</option>"
+         s = s + "<option value='"& val &"' selected>"& pkgName &"</option>"
          selectedFound = True
-         NNpv_id = CStr(rsTemp.Fields("pv_id"))
+         NNpv_id = val
       Else
-         s = s + "<option value='"& tempLINK &"'>"& pkgName &"</option>"
+         s = s + "<option value='"& val &"'>"& pkgName &"</option>"
       End If
       numPackages = numPackages + 1
       rsTemp.MoveNext
    WEnd
    s = s + "</select></td>"
-   ' Correct for a situation where selectedFound is still FALSE.
-   If NOT selectedFound Then
+   If NNrtag_id > 0 Then
-      rsTemp.MoveFirst
-      If ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF)) Then
-         NNpv_id = Cstr(rsTemp.Fields("pv_id"))
-      Else
-         NNpv_id = "0"
-      End If
-   End If
-   ' replace drop down list with a warning if no package versions were found, and ensure that the user cannot submit the form
+       ' replace drop down list with a warning if no package versions were found, and ensure that the user cannot submit the form
-   If numPackages = 0 Then
+       If numPackages = 0 Then
-      bPreventSubmit = True
+          bPreventSubmit = True
-      If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
+          If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
-         s = "<td>Package</td><td><a style=color:Red>WARNING: No WIP package versions found. The operation cannot be performed.</a></td>"
+             s = "<td>Package</td><td><a style=color:Red>WARNING: No WIP package versions found. The operation cannot be performed.</a></td>"
-      Else
+          Else
-         s = "<td>Package</td><td><a style=color:Red>WARNING: No released package versions found. The operation cannot be performed.</a></td>"
+             s = "<td>Package</td><td><a style=color:Red>WARNING: No released package versions found. The operation cannot be performed.</a></td>"
+          End If
-      End If
+       End If
+   Else
+        s = "<td>Package</td><td></td>"
    End If
    rsTemp.Close
    Set rsTemp = nothing
 End If
 ' If this form is opened with an OP_CODE, RTAG_ID and PV_ID only, then we need to derive the PROJ_ID before
 ' calling Get_Projects() to generate the project drop down list.
 If parProj_id = "0" AND NOT IsNull(parRtag_id) AND parRtag_id <> "" AND parRtag_id <> "0" Then
-   parProj_id = Get_Proj_ID(parRtag_id)
+   parProj_id = DB_PROJ_ID
 End If
 ' Hide the Package drop-down list if the Daemon Instruction does not require it
 If DaemonInstructionNeedsPV_ID(parOp_code) Then
    bHidePackages = False
 ' DaemonsAvailable() functions further below to hide the form submit button.
 ' It will also support the submit action itself when it takes place during the editing of an existing record where
 ' the user changes (for example) the project without making any changes to release or package and so those items
 ' are nullified and must be reset to something other than their original values that came through the query string
 ' when the edit form was just opened.
-Call Get_Projects(parProj_id)                  ' Ensures parProj_id has a good value
+'Call Get_Projects(parProj_id)                  ' Ensures parProj_id has a good value
-Call Get_Releases(parProj_id, parRtag_id)      ' Ensures parRtag_id has a good value
+'Call Get_Releases(parProj_id, parRtag_id)      ' Ensures parRtag_id has a good value
-If NOT bHidePackages Then
+'If NOT bHidePackages Then
-   Call Get_Packages (parRtag_id, parPv_id, parOp_code)
+'   Call Get_Packages (parRtag_id, parPv_id, parOp_code)
-End If
+'End If
 ' Perform any required actions
 Call performActions
 '----------------------------------------------
 %>
 <script language="JavaScript" type="text/javascript">
 <!--
-// This function is designed to be called when a repeat radio button is pressed. It reloads the page with an updated query string
+// This function is designed to be called when one of the controls is updated
-// to reflect the new setting of the radio button set
+// It will be refresh the page with the current set of values
-function Refresh_Repeat(newRepeat)
+function Refresh_Page()
+{
+    function defVal(el, def) {
+        if(el) {
+            return el.value;
+        }
+        return def;
+    }
+    function getValDef(name, def) {
+        return defVal(document.getElementById(name), def);
+    }
    var s;
    s  = '<%=scriptName%>';
-   s += '?inst_id=' + document.getElementById('inst_id').value;
+   s += '?inst_id=' + getValDef('inst_id',0);
-   s += '&op_code=' + document.getElementById('op_code').value;
+   s += '&op_code=' + getValDef('op_code',0);
-   s += '&proj_id=' + document.getElementById('proj_id').value;
+   s += '&proj_id=' + getValDef('proj_id',0);
-   s += '&rtag_id=' + document.getElementById('rtag_id').value;
+   s += '&rtag_id=' + getValDef('rtag_id',0);
-   s += '&pv_id='   + document.getElementById('pv_id').value;
+   s += '&pv_id='   + getValDef('pv_id',0);
-   s += '&sort='    + document.getElementById('sortOrder').value;
+   s += '&sdt='     + getValDef('scheduled_time','').substr(4);
-   s += '&sdt='     + document.getElementById('scheduled_time').value;
+   s += '&repeat='  + defVal(document.querySelector('input[name="repeat_inst"]:checked'),0);
-   s += '&repeat='  + newRepeat;
-   s += '&rfile='   + document.getElementById('rfile').value;
+   s += '&rfile='   + getValDef('rfile','');
    document.location = s;
+}
 //-->
         #ui-datepicker-div {
             position: absolute !important;
             top: 0px !important;
             left: 0px !important;
+            }
+        .ui-datepicker-trigger{
+			vertical-align: top;
+			padding-left: 3px;
+		}
     </style>
    </head>
-   <body background="images/bg_bage_0.gif" leftmargin="0" topmargin="0" >
+   <body leftmargin="0" topmargin="0" >
-      <table class="full_table">
          <%
          '-- FROM START --------------------------------------------------------------------------------------------------------------
          objFormComponent.FormName = "DaemonInstruction"
          objFormComponent.FormClass = "form_tight"
          objFormComponent.Action = ScriptName &_
                                    "&sort="&    parSortOrder &_
                                    "&rfile="& parRfile
          objFormComponent.OnSubmit = "ShowProgress();"
          Call objFormComponent.FormStart()
          %>
+      <table class="full_table">
          <tr>
             <td>
                <!-- MESSAGE +++++++++++++++++++++++++++++++++++++++++++++++ -->
                <%Call Messenger ( sMessage , sMessageType, "100%" )%>
                <!-- MESSAGE +++++++++++++++++++++++++++++++++++++++++++++++++++ -->
                <!--#include file="messages/_msg_inline.asp"-->
-               <table class="full_table form_item">
+               <table class="full_table form_item form_field_bg">
                   <tr>
                      <td width="1%" class="nowrap">
                         <%=Get_OpCodes(parOp_code)%>
                      </td>
                   </tr>
                   <%If NOT bHideRepeat Then%>
                      <tr>
                         <td>
                            <td>Repeat</td>
                            <td>
-                              <input type="radio" name="repeat_inst" id="repeat_inst_no"     value="No"   <%If parRepeat =     "0" Then%>checked<%End If%> onchange='Refresh_Repeat(0)'     >No
+                              <input type="radio" name="repeat_inst" id="repeat_inst_no"     value="0"   <%If parRepeat =     "0" Then%>checked<%End If%> onchange='Refresh_Page()'     >No
-                              <input type="radio" name="repeat_inst" id="repeat_inst_24hrs"  value="24Hrs"<%If parRepeat = "86400" Then%>checked<%End If%> onchange='Refresh_Repeat(86400)' >24 Hrs
+                              <input type="radio" name="repeat_inst" id="repeat_inst_24hrs"  value="86400"<%If parRepeat = "86400" Then%>checked<%End If%> onchange='Refresh_Page()' >24 Hrs
                            </td>
                         </td>
                      </tr>
                   <%End If%>
                   <tr>
                     <td style="height:100px">
                     </td>
                   </tr>
                  <tr>
-                    <td background="images/bg_login.gif" colspan=3>
+                    <td class=form_field_hdrgap colspan=3>
                        <table class="full_table">
                           <tr>
                              <td><%=ProgressBar()%></td>
                              <td align="right" >
                                 <%
                                 Dim disableText : disableText = ""
-                                If NOT (ReleasesAvailable(parProj_id) AND DaemonsAvailable(parRtag_id) AND NOT bPreventSubmit AND IsNull(sMessage)) Then
+                                If NOT ( (NOT bHidePackages AND parPv_id > 0 )  AND  ReleasesAvailable(parProj_id) AND DaemonsAvailable(parRtag_id) AND NOT bPreventSubmit AND IsNull(sMessage)) Then
                                     disableText = "disabled=""disabled"""
                                 End If
                                 %>
                                 <button name="btn" type="submit" <%=disableText%>>Add/Update</button>
                                 <button name="btn" type="reset" onclick="parent.closeIFrame();">Cancel</button>
                              </td>
                           </tr>
                        </table>
                     </td>
                  </tr>
-                  <tr>
-                     <td>
-                        <input type="hidden" id="inst_id"     name="inst_id"      value="<%=parInst_id%>">
-                        <input type="hidden" id="op_code"     name="op_code"      value="<%=parOp_code%>">
-                        <input type="hidden" id="proj_id"     name="proj_id"      value="<%=parProj_id%>">
-                        <input type="hidden" id="rtag_id"     name="rtag_id"      value="<%=parRtag_id%>">
-                        <input type="hidden" id="pv_id"       name="pv_id"        value="<%=parPv_id%>">
-                        <input type="hidden" id="repeat_secs" name="repeat_secs"  value="<%=parRepeat%>">
-                        <input type="hidden" id="rfile"       name="rfile"        value="<%=parRfile%>">
-                        <input type="hidden" id="sortOrder"   name="sortOrder"    value="<%=parSortOrder%>">
-                     </td>
-                  </tr>
                </table>
             </td>
          </tr>
-         <%=objPMod.ComposeHiddenTags()%>
-         <input type="hidden" name="action" value="true">
-         <%
-         Call objFormComponent.FormEnd()
-         '-- FROM END ----------------------------------------------------------------------------------------------------------------
-         %>
       </table>
+      <input type="hidden" id="inst_id"     name="inst_id"      value="<%=parInst_id%>">
+      <input type="hidden" id="repeat_secs" name="repeat_secs"  value="<%=parRepeat%>">
+      <input type="hidden" id="rfile"       name="rfile"        value="<%=parRfile%>">
+      <input type="hidden"                  name="action"       value="true">
+      <%
+      objPMod.ComposeHiddenTags()
+      Call objFormComponent.FormEnd()
+      '-- FROM END ----------------------------------------------------------------------------------------------------------------
+      %>
    </body>
 </html>
 <%
 '------------ RUN AFTER PAGE RENDER -----------
 Set objFormCollector = Nothing

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/wAddDaemonInstruction.asp – Rev 6676 → 6695