Subversion Repositories DevTools

Rev

Rev 163 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 163 Rev 173
Line 61... Line 61...
61
      styleNow = styleAlt1
61
      styleNow = styleAlt1
62
   End If
62
   End If
63
End Sub
63
End Sub
64
'--------------------------------------------------------------------------------------------------------------------------
64
'--------------------------------------------------------------------------------------------------------------------------
65
' Convert run level into a meaningful string
65
' Convert run level into a meaningful string
66
Function Get_Run_Level( nLevel, indefinitePause )
66
Function Get_Run_Level( nLevel, indefinitePause, astate)
67
 
67
 
68
   If indefinitePause Then
68
   If indefinitePause Then
69
      Get_Run_Level = "<span class='err_alert'>Stopped</span>"
69
      Get_Run_Level = "<span class='err_alert'>Stopped</span>"
-
 
70
   ElseIf astate = 1 Then      ' if build daemon paused
70
   Else
71
      Get_Run_Level = "Paused"
-
 
72
   ElseIf astate = 2 Then      ' if build daemon disabled
-
 
73
      Get_Run_Level = "Disabled"
-
 
74
   ElseIf IsNull(astate) Then  ' if build daemon enabled
71
      If nLevel = 1 Then
75
      If nLevel = 1 Then
72
         Get_Run_Level = "Cannot Continue"
76
         Get_Run_Level = "Cannot Continue"
73
      ElseIf nLevel = 2 Then
77
      ElseIf nLevel = 2 Then
74
         Get_Run_Level = "Paused"
78
         Get_Run_Level = "Paused"
75
      ElseIf nLevel = 3 Then
79
      ElseIf nLevel = 3 Then
Line 762... Line 766...
762
 
766
 
763
                           ' Integer variables
767
                           ' Integer variables
764
                           Dim pkgId
768
                           Dim pkgId
765
                           Dim lastProjID                ' Used to detect project changes from one row to the next
769
                           Dim lastProjID                ' Used to detect project changes from one row to the next
766
                           Dim lastRtagId                ' Used to detect release changes from one row to the next
770
                           Dim lastRtagId                ' Used to detect release changes from one row to the next
-
 
771
                           Dim daemonState
767
 
772
 
768
                           ' Initialise variables
773
                           ' Initialise variables
769
                           strProject_checked = ""
774
                           strProject_checked = ""
770
 
775
 
771
                           bProject_changed = True
776
                           bProject_changed = True
Line 807... Line 812...
807
                                 bRelease_changed = True
812
                                 bRelease_changed = True
808
                                 bRelease_link_displayed = False
813
                                 bRelease_link_displayed = False
809
                                 bDisplay_whole_set = False
814
                                 bDisplay_whole_set = False
810
                              End If
815
                              End If
811
 
816
 
-
 
817
                              daemonState = rsQry("pause")
-
 
818
 
812
                              ' generate the table row divider - this uses the bRow_displayed value from the previous iteration in order
819
                              ' generate the table row divider - this uses the bRow_displayed value from the previous iteration in order
813
                              ' to prevent dividers being drawn between rows that were not actually rendered due to any filtering that
820
                              ' to prevent dividers being drawn between rows that were not actually rendered due to any filtering that
814
                              ' may be in effect.
821
                              ' may be in effect.
815
                              %>
822
                              %>
816
                              <%=HTML_Row_Divider( bProject_changed, strProject_checked, bRelease_changed, bRow_displayed )%>
823
                              <%=HTML_Row_Divider( bProject_changed, strProject_checked, bRelease_changed, bRow_displayed )%>
Line 901... Line 908...
901
 
908
 
902
 
909
 
903
                                       <td nowrap <%=styleNow%>><%=Get_Official(rsQry("official"))%></td>
910
                                       <td nowrap <%=styleNow%>><%=Get_Official(rsQry("official"))%></td>
904
                                       <td nowrap <%=styleNow%>><%=Get_Daemon_Mode(rsQry("daemon_mode"))%></td>
911
                                       <td nowrap <%=styleNow%>><%=Get_Daemon_Mode(rsQry("daemon_mode"))%></td>
905
                                       <td nowrap <%=styleNow%>><%=rsQry("display_name")%></td>
912
                                       <td nowrap <%=styleNow%>><%=rsQry("display_name")%></td>
906
                                       <td nowrap <%=styleNow%>><%=Get_Run_Level(rsQry("current_run_level"), bIndefinitelyPaused)%></td>
913
                                       <td nowrap <%=styleNow%>><%=Get_Run_Level(rsQry("current_run_level"), bIndefinitelyPaused,daemonState)%></td>
907
                                       <td nowrap <%=styleNow%>><%=Get_Pkg_Name(pkgId)%></td>
914
                                       <td nowrap <%=styleNow%>><%=Get_Pkg_Name(pkgId)%></td>
908
 
915
 
909
                                       <%If (rsQry("delta") > 600) AND (IsNull(pkgId) OR pkgId = "") Then%>
916
                                       <%If (rsQry("delta") > 600) AND (IsNull(pkgId) OR pkgId = "") Then%>
910
                                          <td nowrap <%=styleNow%> style=color:Red><%=rsQry("delta")%></td>
917
                                          <td nowrap <%=styleNow%> style=color:Red><%=rsQry("delta")%></td>
911
                                       <%Else%>
918
                                       <%Else%>