Work in progress

webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ReportsRepository.scala

@@ -84,11 +84,16 @@ trait ReportsRepository {
   ) : Seq[Reports]
 
   def findReportsByNodeOnInterval(
-      nodeId: NodeId
+    nodeId: NodeId
     , start : DateTime
     , end   : DateTime
   ) : Seq[Reports]
 
+  def findReportsByNodeByRun(
+      nodeId: NodeId
+    , runDate : DateTime
+  ) : Seq[Reports]
+
   //databaseManager only
   def getReportsInterval()         : Box[(Option[DateTime], Option[DateTime])]
   def getArchivedReportsInterval() : Box[(Option[DateTime], Option[DateTime])]

webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala

@@ -100,6 +100,17 @@ class ReportsJdbcRepository(doobie: Doobie) extends ReportsRepository with Logga
     transactRun(xa => q.to[Vector].transact(xa))
   }
 
+
+  override def findReportsByNodeByRun(
+    nodeId: NodeId
+    , runDate : DateTime
+  ) : Vector[Reports] = {
+    val q = Query[(NodeId, DateTime), Reports](baseQuery +
+      " and nodeId = ? and executionTimeStamp = ? ORDER BY executionTimeStamp asc"
+      , None).toQuery0((nodeId, runDate))
+    transactRun(xa => q.to[Vector].transact(xa))
+  }
+
   override def findReportsByNodeOnInterval(
       nodeId: NodeId
     , start : DateTime

webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala

@@ -1809,6 +1809,7 @@ object RudderConfig extends Loggable {
     , reportingServiceImpl
     , techniqueRepositoryImpl
     , configService
+    , logDisplayerImpl
   )
   private[this] lazy val propertyRepository = new RudderPropertiesRepositoryImpl(doobie)
   private[this] lazy val autoReportLogger = new AutomaticReportLogger(

webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala

@@ -279,7 +279,7 @@ class ShowNodeDetailsFromNode(
       "#nodeDetails" #> DisplayNode.showNodeDetails(inventory, Some((node, globalMode)), Some(node.creationDate),  AcceptedInventory, isDisplayingInPopup = withinPopup) &
       "#nodeInventory *" #> DisplayNode.show(inventory, false) &
       "#reportsDetails *" #> reportDisplayer.asyncDisplay(node) &
-      "#logsDetails *" #> logDisplayer.asyncDisplay(node.id) &
+      "#logsDetails *" #> Script(OnLoad(logDisplayer.asyncDisplay(node.id,None))) &
       "#node_parameters -*" #> (if(node.id == Constants.ROOT_POLICY_SERVER_ID) NodeSeq.Empty else nodeStateEditForm(node).nodeStateConfiguration) &
       "#node_parameters -*" #> agentPolicyModeEditForm.cfagentPolicyModeConfiguration &
       "#node_parameters -*" #> agentScheduleEditForm(node).cfagentScheduleConfiguration &

webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/LogDisplayer.scala

@@ -41,7 +41,6 @@ import com.normation.rudder.domain.policies.RuleId
 import com.normation.rudder.web.model._
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.domain.reports.Reports
-import scala.xml._
 import net.liftweb.common._
 import net.liftweb.http._
 import net.liftweb.http.js._
@@ -76,10 +75,12 @@ class LogDisplayer(
 
   private val gridName = "logsGrid"
 
-  def asyncDisplay(nodeId : NodeId) : NodeSeq = {
+  def asyncDisplay(nodeId : NodeId, runDate : Option[DateTime])  = {
     val id = JsNodeId(nodeId)
-    val ajaxRefresh =  SHtml.ajaxInvoke( () => refreshData(nodeId, reportRepository.findReportsByNode(nodeId)))
-
+    val ajaxRefresh =  runDate match {
+      case Some(runDate) => SHtml.ajaxInvoke (() => refreshData (nodeId, reportRepository.findReportsByNodeByRun (nodeId, runDate).filter(_.severity.startsWith("log")) ) )
+      case None => SHtml.ajaxInvoke (() => refreshData (nodeId, reportRepository.findReportsByNode (nodeId) ) )
+    }
     def getEventsInterval(jsonInterval: String): JsCmd = {
       import net.liftweb.util.Helpers.tryo
       import net.liftweb.json.parse
@@ -113,19 +114,17 @@ class LogDisplayer(
       }
     }
 
-    Script(
-      OnLoad(
         // set static content
         SetHtml("logsDetails",content) &
         // Create empty table
         JsRaw(s"""
+         console.log("${runDate}")
          var pickEventLogsInInterval = ${AnonFunc(SHtml.ajaxCall(JsRaw(
            """'{"start":"'+$(".pickStartInput").val()+'", "end":"'+$(".pickEndInput").val()+'"}'"""
          ), getEventsInterval)._2).toJsCmd}
 
           createTechnicalLogsTable("${gridName}",[], "${S.contextPath}",function() {${ajaxRefresh.toJsCmd}}, pickEventLogsInInterval);""") &
         // Load data asynchronously
-
         JsRaw(
       s"""
         $$("#details_${id}").on( "tabsactivate", function(event, ui) {
@@ -134,7 +133,7 @@ class LogDisplayer(
           }
         });
       """
-    )))
+    )
   }
 
   /**
@@ -169,6 +168,7 @@ class LogDisplayer(
 
         ReportLine (
             report.executionDate
+          , report.executionTimestamp
           , report.severity
           , ruleName
           , directiveName
@@ -205,6 +205,7 @@ class LogDisplayer(
  */
 case class ReportLine (
     executionDate  : DateTime
+  , runDate        : DateTime
   , severity       : String
   , ruleName       : String
   , directiveName  : String
@@ -217,6 +218,7 @@ case class ReportLine (
 
       JsObj(
           ( "executionDate", executionDate.toString("yyyy-MM-dd HH:mm:ss") )
+        , ( "runDate", runDate.toString("yyyy-MM-dd HH:mm:ss") )
         , ( "severity"     , severity )
         , ( "ruleName"     , escapeHTML(ruleName) )
         , ( "directiveName", escapeHTML(directiveName) )

webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala

@@ -52,14 +52,15 @@ import net.liftweb.http.js.JsCmd
 import net.liftweb.http.js.JsCmds._
 import net.liftweb.util.Helpers._
 import org.joda.time.format.DateTimeFormat
+
 import scala.xml.NodeSeq
 import scala.xml.NodeSeq.seqToNodeSeq
 import com.normation.appconfig.ReadConfigService
 import com.normation.rudder.domain.policies.PolicyMode
 import com.normation.rudder.web.ChooseTemplate
 import com.normation.rudder.domain.nodes.NodeState
-
 import com.normation.box._
+import org.joda.time.DateTime
 
 /**
  * Display the last reports of a server
@@ -71,6 +72,7 @@ class ReportDisplayer(
   , reportingService    : ReportingService
   , techniqueRepository : TechniqueRepository
   , configService       : ReadConfigService
+  , logDisplayer: LogDisplayer
 ) extends Loggable {
 
   private[this] val getAllNodeInfos = RudderConfig.nodeInfoService.getAll _
@@ -108,9 +110,20 @@ class ReportDisplayer(
       for {
         report  <- reportingService.findNodeStatusReport(node.id)
         data    <- getComplianceData(node.id, report)
+        runDate : Option[DateTime] = report.runInfo match {
+          case a : ComputeCompliance => Some(a.lastRunDateTime)
+          case a : LastRunAvailable  => Some(a.lastRunDateTime)
+          case a : NoExpectedReport   => Some(a.lastRunDateTime)
+          case a : NoReportInInterval => None
+          case a : Pending => a.optLastRun.map(_._1)
+          case a : ReportsDisabledInInterval => None
+          case  NoRunNoExpectedReport => None
+
+        }
       } yield {
         import net.liftweb.util.Helpers.encJs
         val intro = encJs(displayIntro(report).toString)
+        logDisplayer.asyncDisplay(node.id,runDate) &
         JsRaw(s"""refreshTable("reportsGrid",${data.json.toJsCmd}); $$("#node-compliance-intro").replaceWith(${intro})""")
       }
     }

webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js

@@ -1235,12 +1235,20 @@ function createTechnicalLogsTable(gridId, data, contextPath, refresh, pickEventL
       "sWidth": "24%"
     , "mDataProp": "message"
     , "sTitle": "Message"
+  } , {
+      "mDataProp": "runDate"
+    , "sTitle": "Run date"
+    , "bVisible" : false
   } ];
+  console.log("youhouh")
 
   var params = {
       "bFilter" : true
     , "bPaginate" : true
     , "bLengthChange": true
+    , "rowGroup": {
+         dataSrc: 'runDate'
+      }
     , "sPaginationType": "full_numbers"
     , "oLanguage": {
         "sSearch": ""

webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/common-layout.html

@@ -23,6 +23,8 @@
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-bootstrap.css" media="screen" />
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-quicksearch.css" media="screen" />
 
+    <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/datatables/rowGroup-bootstrap-1.1.0.min.css" media="screen" />
+
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/AdminLTE/AdminLTE.min.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-menu.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-datatable.css" media="screen" />
@@ -34,6 +36,7 @@
 
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/jstree/jquery.jstree.min.js"></script>
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/datatables/datatables.min.js"></script>
+    <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/datatables/dataTables-rowGroup-1.1.0.min.js"></script>
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/jquery-ui.min.js"></script>
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/timepicker/jquery-ui-timepicker-addon.min.js"></script>
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/jquery/timepicker/jquery-ui-timepicker-addon-en.js"></script>

webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/reports_server.html

@@ -3,7 +3,11 @@
   <runAgent></runAgent>
   <lastreportgrid-intro></lastreportgrid-intro>
 
+
+  <table id="logsGrid" cellspacing="0"></table>
+
   <lastreportgrid-grid></lastreportgrid-grid>
+
   <div id="reportsGrid_paginate_area" class="paginate"></div>