last 3 month does not include current month

pdb-js/src/app/plot-view/plot-view.component.ts

@@ -182,9 +182,7 @@ export class PlotViewComponent implements OnInit {
     
     const newDateRange = formattedStartDate+" - "+formattedEndDate;
     
-    //(<HTMLInputElement>document.getElementById("search-date-range")).value = newDateRange;
     this.dateRangeUpdateEvent.emit(newDateRange);
-    //this.plot();
   }
 
   zoomRange(range: SelectionRange) {
@@ -251,6 +249,10 @@ export class PlotViewComponent implements OnInit {
 
     const request = this.createPlotRequest(dimension);
 
+    this.imageUrl = '';
+    this.stats = null;
+    
+    document.dispatchEvent(new Event("invadersStart", {}));
     this.loadingEvent.emit(new LoadingEvent(true));
     const x = this.service.sendPlotRequest(request).subscribe({
       next: (plotResponse: PlotResponse) => {

pdb-js/src/assets/js/invaders.js

@@ -7,35 +7,27 @@ var invaders_stepSize = 5;
 var invaders_margin = 30;
 var invaders_city_height = 75;
 var invaders_pause = true;
-var invaders_parentDivId = 'invaders_area';
+var invaders_area = 'invaders_area';
 var invaders_kills = 0;
 var invaders_points = 0;
 var invaders_points_kill = 10;
 var invaders_points_lost = -50;
 var invaders_game_over = false;
 var invaders_loop_count = 0;
+var invaders_parentDivId = "invaders";
 
 function initInvaders(parentDivId) {
+    invaders_parentDivId = parentDivId;
 	
-	// create a copy of the parentDiv
-	// and set it at the exact same position
-	var parent = $('#'+parentDivId);
-    var height = parent.height();
-    var width = parent.width();
-    $('body').append('<div id="'+invaders_parentDivId+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
-    $('#'+invaders_parentDivId).offset({ top: parent.offset().top, left: parent.offset().left})
-    $('#'+invaders_parentDivId).height(parent.height());
-    $('#'+invaders_parentDivId).width(parent.width());
-    
-    $('#'+invaders_parentDivId)
+    $('body').append('<div id="'+invaders_area+'"><div id="invaders_points">Points: 0</div><div id="invaders_kills">Kills: 0</div><div id="invaders_game_over"><div class="invader_notify">Game Over</div></div></div>');
     
     $('.invader_notify').click(function() {
     	// restart the game
-    	$('#'+invaders_parentDivId).remove();
-    	initInvaders(parentDivId);
+    	$('#'+invaders_area).remove();
+    	initInvaders(invaders_parentDivId);
     	invaders_game_over = false;
     	invaders_kills = 0;
-		invaders_points = 0;
+		  invaders_points = 0;
 		
     	startInvaders();
     });
@@ -49,7 +41,7 @@ function gameOver() {
 }
 
 function pauseInvaders() {
-	$('#'+invaders_parentDivId).hide();
+	$('#'+invaders_area).hide();
 	clearIntervals();
 }
 
@@ -60,15 +52,25 @@ function clearIntervals() {
 
 function startInvaders() {
 
-	$('#'+invaders_parentDivId).show();
+  // move invaders_area to the same position as the parent div
+  const parent = $('#'+invaders_parentDivId);
+  const height = parent.height();
+  const width = parent.width();
+  const area = document.getElementById(invaders_area);
+  area.style.top=parent.offset().top+"px";
+  area.style.left=parent.offset().left+"px";
+  area.style.height=parent.height()+"px";
+  area.style.width=parent.width()+"px";
+	
+	$('#'+invaders_area).show();
 
 	if (!invaders_game_over) {
 		if (invaders_count == 0) {
-			addInvader(invaders_parentDivId);
+			addInvader(invaders_area);
 		}
 	
 		clearIntervals();
-		invaders_game_move=window.setInterval("moveRandomly('"+invaders_parentDivId+"')",100);
+		invaders_game_move=window.setInterval("moveRandomly('"+invaders_area+"')",100);
 		invaders_game_new=window.setInterval("addInvader()", 1000);
 	}
 }
@@ -77,7 +79,7 @@ function startInvaders() {
 function addInvader()
 {
     var id = 'invader_' + invaders_count++;
-    var parent = $('#'+invaders_parentDivId);
+    var parent = $('#'+invaders_area);
     var height = parent.height();
     var width = parent.width();
     var top =  10; // start at the top
@@ -114,8 +116,8 @@ function moveRandomly(parentDivId)
 		    var top = invader.position().top;
 		    var left = invader.position().left;
 		
-			var parent = $('#'+parentDivId);
-			var minTop = parent.position().top;
+			  var parent = $('#'+parentDivId);
+			  var minTop = parent.position().top;
 		    var maxTop = parent.height();
 		    var width = parent.width();
 		

pdb-js/src/index.html

@@ -40,7 +40,7 @@
               'Last 30 Days': [moment().subtract(29, 'days').startOf('day'), moment().endOf('day')],
               'This Month': [moment().startOf('month'), moment().endOf('month').endOf('day')],
               'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
-              'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().endOf('month').endOf('day')],
+              'Last 3 Months': [moment().subtract(3, 'month').startOf('month'),moment().subtract(1, 'month').endOf('month').endOf('day')],
               'This Year': [moment().startOf('year'),moment().endOf('month').endOf('day')],
               'Last Year': [moment().subtract(1, 'year').startOf('year'),moment().subtract(1, 'year').endOf('year')],
           },

pdb-plotting/src/main/java/org/lucares/recommind/logs/YAxisTicks.java

@@ -130,7 +130,11 @@ class YAxisTicks {
                 "\"10m\" 10000000", //
                 "\"100m\" 100000000", //
                 "\"1b\" 1000000000.0", //
-                "\"10b\" 10000000000.0" //
+                "\"10b\" 10000000000.0", //
+                "\"100b\" 100000000000.0", //
+                "\"1t\" 1000000000000.0", //
+                "\"10t\" 10000000000000.0", //
+                "\"100t\" 100000000000000.0" //
         );
 
         return ticsLabels;

pdb-ui/src/main/java/org/lucares/pdbui/WebConfiguration.java

@@ -88,6 +88,8 @@ public class WebConfiguration implements WebMvcConfigurer, HardcodedValues, Prop
 
         registry.addViewController("/").setViewName("forward:/index.html");
         registry.addViewController("/vis").setViewName("forward:/index.html");
+        registry.addViewController("/dashboard").setViewName("forward:/index.html");
+        registry.addViewController("/dashboard/**").setViewName("forward:/index.html");
         registry.addViewController("/upload").setViewName("forward:/index.html");
         registry.addViewController("/help").setViewName("forward:/index.html");
     }