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

 <!--#include file="_access_control_general.asp"-->
 <!--#include file="_access_control_login.asp"-->
 <%
 '------------ Variable Definition -------------
 Dim objBtnControl
+Dim parSortOrder
 '------------ Constants Declaration -----------
 '------------ Variable Init -------------------
 Set objBtnControl = New ActionButtonControl
+parSortOrder = Request("sort")
+If IsNull(parSortOrder) OR parSortOrder = "" Then
+   parSortOrder = "0"
+End If
 '----------------------------------------------
 %>
 <%
 '--------------------------------------------------------------------------------------------
 ' Cleans up the daemon instructions table to remove old data that might have become stranded
    "BEGIN PK_BUILDAPI.cleanup_stranded_daemon_insts; END;"
    objEH.CatchORA ( OraSession )
 End Sub
-'--------------------------------------------------------------------------------------------
-' Get a project name from a release tag
-'--------------------------------------------------------------------------------------------
-Function ProjectName(nRtag_Id)
-   Dim rsTemp
-   Dim query_string
-   ProjectName = ""
-   If (NOT IsNull(nRtag_Id)) AND (nRtag_Id <> "") Then
-      query_string = "SELECT proj_id FROM release_tags WHERE rtag_id = " & nRtag_Id
-      Set rsTemp = OraDatabase.DbCreateDynaset( query_string, ORADYN_DEFAULT )
-      If (NOT rsTemp.BOF) AND (NOT rsTemp.EOF) Then
-         query_string = "SELECT proj_name FROM projects WHERE proj_id = " & rsTemp("proj_id")
-         Set rsTemp = OraDatabase.DbCreateDynaset( query_string, ORADYN_DEFAULT )
-         If (NOT rsTemp.BOF) AND (NOT rsTemp.EOF) Then
-            ProjectName = rsTemp("proj_name")
-         End If
-      End If
-      rsTemp.Close()
-      set rsTemp = nothing
-   End If
-End Function
-'--------------------------------------------------------------------------------------------
-' Get a release name from a release tag
-'--------------------------------------------------------------------------------------------
-Function ReleaseName(nRtag_Id)
-   Dim rsTemp
-   Dim query_string
-   ReleaseName = ""
-   If (NOT IsNull(nRtag_Id)) AND (nRtag_Id <> "") Then
-      query_string = "SELECT rtag_name FROM release_tags WHERE rtag_id = " & nRtag_Id
-      Set rsTemp = OraDatabase.DbCreateDynaset( query_string, ORADYN_DEFAULT )
-      If (NOT rsTemp.BOF) AND (NOT rsTemp.EOF) Then
-         ReleaseName = rsTemp("rtag_name")
-      End If
-      rsTemp.Close()
-      set rsTemp = nothing
-   End If
-End Function
-'--------------------------------------------------------------------------------------------
-' Get a user name/email from a user ID
-'--------------------------------------------------------------------------------------------
-Sub GetUserName(nUserId, outUserName, outUserEmail)
-   Dim rsTemp
-   Dim query_string
-   outUserName  = ""
-   outUserEmail = ""
-   If (NOT IsNull(nUserId)) AND (nUserId <> "") Then
-      query_string = "SELECT usr.FULL_NAME, usr.USER_EMAIL" &_
-                     "  FROM USERS usr" &_
-                     " WHERE usr.USER_ID = " & nUserId
-      Set rsTemp = OraDatabase.DbCreateDynaset( query_string, ORADYN_DEFAULT )
-      If (NOT rsTemp.BOF) AND (NOT rsTemp.EOF) Then
-         outUserName  = rsTemp("full_name")
-         outUserEmail = rsTemp("user_email")
-      End If
-      rsTemp.Close()
-      set rsTemp = nothing
-   End If
-End Sub
 %>
 <%
 ' Clean up old data
 CleanupOldData
          </div>
          <tr></tr>
          <tr>
             <td></td>
             <!-- DAEMON INSTRUCTION DETAILS +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">OPERATION</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <%If parSortOrder = "1" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=1a'>
+               <%ElseIf parSortOrder = "1a" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=1b'>
+               <%ElseIf parSortOrder = "1b" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=1c'>
+               <%Else%>
+                  <a href='admin_daemon_instructions.asp?sort=1'>
+               <%End If%>
+               OPERATION
+            </td>
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">PROJECT</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <%If parSortOrder = "2" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=2a'>
+               <%ElseIf parSortOrder = "2a" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=2b'>
+               <%Else%>
+                  <a href='admin_daemon_instructions.asp?sort=2'>
+               <%End If%>
+               PROJECT
+            </td>
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">RELEASE</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <%If parSortOrder = "3" Then%>
+                  <a href='admin_daemon_instructions.asp?sort=3a'>
+               <%Else%>
+                  <a href='admin_daemon_instructions.asp?sort=3'>
+               <%End If%>
+               RELEASE
+            </td>
             <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">MODE</td>
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">PACKAGE</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <a href='admin_daemon_instructions.asp?sort=4'>PACKAGE
+            </td>
             <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">VERSION</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">SCHEDULED TIME<br>(<SPAN style=color:Red>Red</SPAN> = overdue)<br>(<SPAN style=color:Green>Green</SPAN> = ready)</td>
+               <a href='admin_daemon_instructions.asp?sort=0'>SCHEDULED TIME<br>(<SPAN style=color:Red>Red</SPAN> = overdue)<br>(<SPAN style=color:Green>Green</SPAN> = ready)</td>
             <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">REPEAT</td>
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">ADDED BY</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <a href='admin_daemon_instructions.asp?sort=5'>ADDED BY
+            </td>
             <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">LAST<br>UPDATED</td>
-            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">IN<br>PROGRESS</td>
+            <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">
+               <a href='admin_daemon_instructions.asp?sort=6'>IN<br>PROGRESS
+            </td>
             <td align="left" nowrap background="images/bg_table_col.gif" class="body_col">EDIT/DELETE</td>
          </tr>
          <tr>
             <td colspan="13" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
          </tr>
          ' Load some action buttons
          Call objBtnControl.LoadActionButtons ( Array("btnEditDaemonInst", "btnDeleteDaemonInst"), OraDatabase )
          objBtnControl.ButtonSpacer = 1
          Dim rsQry
-         Dim ProjId
-         Dim PkgId
-         Dim PkgName
-         Dim PkgVersion
-         Dim UserName
-         Dim UserEmail
          Dim bInProgress
          Dim bIsReady
          Dim bIsOverdue
          Dim daemonInstId  ' This variable is needed to support the action buttons to Edit/Delete
          Dim bEditEnabled
          Dim bResetInProgressEnabled
+         Dim sortClause
+         Dim sortText
          ' determine if user can reset the in-progress state of a daemon instruction
          bResetInProgressEnabled = UserAllowedToResetInProgress()
          ' query the daemon_instructions table and also create an indication of an overdue instruction,
          ' which is defined as being one that was scheduled for action
+         Select Case (parSortOrder)
+         Case "1"
+            sortClause = " ORDER BY op_code, scheduled_datetime"
+            sortText   = "Data sorted by Operation, Scheduled time"
+         Case "1a"
+            sortClause = " ORDER BY op_code, proj_name, scheduled_datetime"
+            sortText   = "Data sorted by Operation, Project, Scheduled time"
+         Case "1b"
+            sortClause = " ORDER BY op_code, proj_name, rtag_name, scheduled_datetime"
+            sortText   = "Data sorted by Operation, Project, Release, Scheduled time"
+         Case "1c"
+            sortClause = " ORDER BY op_code, proj_name, rtag_name, pkg_name, scheduled_datetime"
+            sortText   = "Data sorted by Operation, Project, Release, Package, Scheduled time"
+         Case "2"
+            sortClause = " ORDER BY proj_name, scheduled_datetime"
+            sortText   = "Data sorted by Project, Scheduled time"
+         Case "2a"
+            sortClause = " ORDER BY proj_name, rtag_name, scheduled_datetime"
+            sortText   = "Data sorted by Project, Release, Scheduled time"
+         Case "2b"
+            sortClause = " ORDER BY proj_name, rtag_name, pkg_name, scheduled_datetime"
+            sortText   = "Data sorted by Project, Release, Package, Scheduled time"
+         Case "3"
+            sortClause = " ORDER BY rtag_name, scheduled_datetime"
+            sortText   = "Data sorted by Release, Scheduled time"
+         Case "3a"
+            sortClause = " ORDER BY rtag_name, pkg_name, scheduled_datetime"
+            sortText   = "Data sorted by Release, Package, Scheduled time"
+         Case "4"
+            sortClause = " ORDER BY pkg_name, scheduled_datetime"
+            sortText   = "Data sorted by Package, Scheduled time"
+         Case "5"
+            sortClause = " ORDER BY full_name, scheduled_datetime"
+            sortText   = "Data sorted by Added By, Scheduled time"
+         Case "6"
+            sortClause = " ORDER BY in_progress, scheduled_datetime"
+            sortText   = "Data sorted by Progress State, Scheduled time"
+         Case Else
+            sortClause = " ORDER BY scheduled_datetime, proj_name, rtag_name, pkg_name"
+            sortText   = "Data sorted by Scheduled time"
+         End Select
-         Set rsQry = OraDatabase.DbCreateDynaset( "SELECT DAEMON_INSTRUCTIONS_ID,"&_
+         Set rsQry = OraDatabase.DbCreateDynaset("SELECT DAEMON_INSTRUCTIONS_ID,"&_
+                                                 "       proj_id,"&_
+                                                 "       proj_name,"&_
+                                                 "       official,"&_
+                                                 "       rtag_id,"&_
+                                                 "       rtag_name,"&_
-                                                  "       OP_CODE,"&_
+                                                 "       OP_CODE,"&_
-                                                  "       RTAG_ID,"&_
+                                                 "       pkg_id,"&_
+                                                 "       (CASE WHEN NVL2(pv_id,pv_id,0) = 0 THEN 'N/A' ELSE pkg_name END) AS pkg_name,"&_
+                                                 "       (CASE WHEN NVL2(pv_id,pv_id,0) = 0 THEN 'N/A' ELSE pkg_version END) AS pkg_version,"&_
-                                                  "       PV_ID,"&_
+                                                 "       PV_ID,"&_
-                                                  "       SCHEDULED_DATETIME,"&_
+                                                 "       SCHEDULED_DATETIME,"&_
-                                                  "       REPEAT_SECS,"&_
+                                                 "       REPEAT_SECS,"&_
-                                                  "       ADDED_DATETIME,"&_
+                                                 "       ADDED_DATETIME,"&_
-                                                  "       USER_ID,"&_
+                                                 "       USER_ID,"&_
-                                                  "       IN_PROGRESS,"&_
+                                                 "       IN_PROGRESS,"&_
-                                                  "       (CASE WHEN SCHEDULED_DATETIME <= SYSDATE THEN 1 ELSE 0 END) AS READY,"&_
+                                                 "       (CASE WHEN SCHEDULED_DATETIME <= SYSDATE THEN 1 ELSE 0 END) AS READY,"&_
-                                                  "       (CASE WHEN (SCHEDULED_DATETIME + (1/144)) < SYSDATE THEN 1 ELSE 0 END) AS OVERDUE"&_
+                                                 "       (CASE WHEN (SCHEDULED_DATETIME + (1/144)) < SYSDATE THEN 1 ELSE 0 END) AS OVERDUE,"&_
+                                                 "       full_name,"&_
-                                                  "  FROM DAEMON_INSTRUCTIONS "&_
+                                                 "       user_email"&_
+                                                 " FROM"&_
+                                                 " daemon_instructions"&_
-                                                  "  ORDER BY RTAG_ID, PV_ID, SCHEDULED_DATETIME, DAEMON_INSTRUCTIONS_ID", ORADYN_DEFAULT )
+                                                 " LEFT JOIN package_versions USING (pv_id)"&_
+                                                 " LEFT JOIN release_tags USING (rtag_id)"&_
+                                                 " LEFT JOIN projects USING (proj_id)"&_
+                                                 " LEFT JOIN packages USING (pkg_id)"&_
+                                                 " LEFT JOIN users USING (user_id)"&_
+                                                 sortClause, ORADYN_DEFAULT )
          While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
             daemonInstId = rsQry("DAEMON_INSTRUCTIONS_ID")
             If IsNull(rsQry("IN_PROGRESS")) OR rsQry("IN_PROGRESS") = "0" Then
                bIsReady = True
             Else
                bIsReady = False
             End If
-            ' Get as much info about the package as we can
-            ProjId=""
-            PkgId = 0
-            PkgName = "N/A"
-            PkgVersion = "N/A"
-            If (NOT IsNull(rsQry("PV_ID"))) AND (rsQry("PV_ID") <> "") Then
-               Call Get_Pkg_Short_Info(rsQry("PV_ID"), PkgId, PkgName, PkgVersion, NULL, NULL, NULL)
-            End If
-            ' derive the proj_id from the rtag_id
-            If (NOT IsNull(rsQry("RTAG_ID"))) AND (rsQry("RTAG_ID") <> "") Then
-               ProjId = Get_Proj_ID(rsQry("RTAG_ID"))
-               ReleaseMode = GetReleaseMode( rsQry("RTAG_ID") )
-            Else
-               ReleaseMode = "Y" ' closed mode used to prevent editing
-            End If
             ' determine if editing is enabled by permissions
             bEditEnabled = True
             If objAccessControl.UserLogedIn Then
-               If NOT objAccessControl.IsDataActive ("PROJECTS", ProjId, "EditProjects") OR NOT objAccessControl.IsDataVisible ("PROJECTS", ProjId, "EditProjects")  Then
+               If NOT objAccessControl.IsDataActive ("PROJECTS", rsQry("proj_id"), "EditProjects") OR NOT objAccessControl.IsDataVisible ("PROJECTS", rsQry("proj_id"), "EditProjects")  Then
                   bEditEnabled = False
-               ElseIf NOT objAccessControl.IsDataActive ("PROJECTS", ProjId, enumDB_PERMISSION_TYPE_ACTIVE) Then
+               ElseIf NOT objAccessControl.IsDataActive ("PROJECTS", rsQry("proj_id"), enumDB_PERMISSION_TYPE_ACTIVE) Then
                   bEditEnabled = False
-               ElseIf ( ReleaseMode <> enumDB_RELEASE_IN_OPEN_MODE ) Then
+               ElseIf ( rsQry("official") <> enumDB_RELEASE_IN_OPEN_MODE ) Then
                   If NOT objAccessControl.IsActive("ApproveForAutoBuild") Then
                      bEditEnabled = False
                   End If
                End If
             Else
                bEditEnabled = False
             End If
-            Call GetUserName(rsQry("User_Id"), UserName, UserEmail)
             %>
             <tr>
                <input type="hidden" name="DAEMON_INSTRUCTIONS_ID_" & daemonInstId value=daemonInstId>
                <td></td>
                <td align="left" valign="top" class="body_txt">
                   <%=DaemonInstructionOperationName(rsQry("OP_CODE"))%>
                </td>
                <td align="left" valign="top" class="body_txt">
-                  <%If ProjId <> "" Then%>
+                  <%If rsQry("proj_id") <> "" Then%>
-                     <a href='rtree.asp?proj_id=<%=ProjId%>'><%=ProjectName(rsQry("RTAG_ID"))%>
+                     <a href='rtree.asp?proj_id=<%=rsQry("proj_id")%>'><%=rsQry("proj_name")%>
                   <%End If%>
                </td>
                <td align="left" valign="top" class="body_txt">
-                  <%If ProjId <> "" Then%>
+                  <%If rsQry("rtag_name") <> "" Then%>
-                     <a href='dependencies.asp?rtag_id=<%=rsQry("RTAG_ID")%>'><%=ReleaseName(rsQry("RTAG_ID"))%>
+                     <a href='dependencies.asp?rtag_id=<%=rsQry("RTAG_ID")%>'><%=rsQry("rtag_name")%>
                   <%End If%>
                </td>
                <td align="left" valign="top" class="body_txt">
-                  <%=Get_Official(ReleaseMode)%>
+                  <%=Get_Official(rsQry("official"))%>
                </td>
                <td align="left" valign="top" class="body_txt">
                   <%If (NOT IsNull(rsQry("PV_ID"))) AND (rsQry("PV_ID") <> "") Then%>
-                     <a href='fixed_issues.asp?rtag_id=<%=rsQry("RTAG_ID")%>&pv_id=<%=rsQry("PV_ID")%>'><%=PkgName%>
+                     <a href='fixed_issues.asp?rtag_id=<%=rsQry("RTAG_ID")%>&pv_id=<%=rsQry("PV_ID")%>'><%=rsQry("pkg_name")%>
                   <%Else%>
-                     <%=PkgName%>
+                     <%=rsQry("pkg_name")%>
                   <%End If%>
                </td>
                <td align="left" valign="top" class="body_txt">
-                  <%=PkgVersion%>
+                  <%=rsQry("pkg_version")%>
                </td>
                <td align="left" valign="top" class="body_txt" <%If bIsOverdue Then%>style=color:Red<%Elseif bIsReady Then%>style=color:Green<%End If%>><%=EuroDateTime(rsQry("SCHEDULED_DATETIME"))%></td>
                <td align="left" valign="top" class="body_txt"><%=DaemonInstructionRepeatString(rsQry("OP_CODE"), rsQry("REPEAT_SECS"))%></td>
                <td align="left" valign="top" class="body_txt">
-                  <%If UserName <> "" AND UserEmail <> "" Then%>
+                  <%If rsQry("full_name") <> "" AND rsQry("user_email") <> "" Then%>
-                     <a href="mailto:<%=UserEmail%>" title="<%=UserEmail%>" class="txt_linked"><%=UserName%></a>
+                     <a href='mailto:<%=rsQry("user_email")%>' title='<%=rsQry("user_email")%>' class="txt_linked"><%=rsQry("full_name")%></a>
                   <%End If%>
                </td>
                <td align="left" valign="top" class="body_txt">
                   <%=EuroDateTime(rsQry("ADDED_DATETIME"))%>
          %>
       </table>
       <table width="50%"  border="0" cellspacing="3" cellpadding="0" >
          <tr>
+            <td class="form_iname">
+               <%=sortText%>
+            </td>
+         </tr>
+      </table>
+      <table width="50%"  border="0" cellspacing="3" cellpadding="0" >
+         <tr>
             <td class="form_iname">&nbsp;</td>
             <td class="val_err"><a href=""><%Call Action_Buttons ( "Add Daemon Instruction" )%> </a>
             <td>&nbsp;</td>
          </tr>
       </table>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/admin_daemon_instructions.asp @ 151 – Rev 147 → 149