Format: Covid/Med/Doze: Diferență între versiuni

Versiunea de la data 18 octombrie 2021 11:06

@@ Linia 9: / Linia 9: @@
 "name":"tablett",
 "values": [
-{"mdatatt":32, "dozeadmtt":40321, "monthtt":"mar 2021", "dozeadmtto":"40 321"},
+{"mdatatt":32, "dozeadmtt":40321, "texttt":"mar 2021 – 40 321"},
-{"mdatatt":62, "dozeadmtt":147315, "monthtt":"apr 2021", "dozeadmtto":"147 315"},
+{"mdatatt":62, "dozeadmtt":147315, "texttt":"apr 2021 – 147 315"},
-{"mdatatt":93, "dozeadmtt":416814, "monthtt":"mai 2021", "dozeadmtto":"416 814"},
+{"mdatatt":93, "dozeadmtt":416814, "texttt":"mai 2021 – 416 814"},
-{"mdatatt":123, "dozeadmtt":716641, "monthtt":"iun 2021", "dozeadmtto":"716 641"},
+{"mdatatt":123, "dozeadmtt":716641, "texttt":"iun 2021 – 716 641"},
-{"mdatatt":154, "dozeadmtt":1042636, "monthtt":"iul 2021", "dozeadmtto":"1 042 636"},
+{"mdatatt":154, "dozeadmtt":1042636, "texttt":"iul 2021 – 1 042 636"},
-{"mdatatt":185, "dozeadmtt":1276186, "monthtt":"aug 2021", "dozeadmtto":"1 276 186"},
+{"mdatatt":185, "dozeadmtt":1276186, "texttt":"aug 2021 – 1 276 186"},
-{"mdatatt":215, "dozeadmtt":1402032, "monthtt":"sep 2021", "dozeadmtto":"1 402 032"},
+{"mdatatt":215, "dozeadmtt":1402032, "texttt":"sep 2021 – 1 402 032"},
+]
+},
+{
+"name":"tablec",
+"values": [
+{"mdatatt":6, "dozeadmtt":36000, "texttt":"14 400"},
+{"mdatatt":23, "dozeadmtt":62570, "texttt":"24 570"},
+{"mdatatt":49, "dozeadmtt":160970, "texttt":"48 000"},
+{"mdatatt":86, "dozeadmtt":886390, "texttt":"100 620"},
+{"mdatatt":97, "dozeadmtt":931990, "texttt":"45 600"},
+]
+},
+{
+"name":"tablead",
+"values": [
+{"mdatatt":59, "dozeadmtt":463970, "texttt":"14400"},
+{"mdatatt":153, "dozeadmtt":1379130, "texttt":"1379130"},
+{"mdatatt":163, "dozeadmtt":1537350, "texttt":"48000"},
+{"mdatatt":167, "dozeadmtt":1599700, "texttt":"100620"},
+{"mdatatt":173, "dozeadmtt":1605550, "texttt":"45600"},
+{"mdatatt":180, "dozeadmtt":1611400, "texttt":"45600"},
+{"mdatatt":194, "dozeadmtt":1665220, "texttt":"45600"},
+{"mdatatt":201, "dozeadmtt":1697980, "texttt":"45600"},
+{"mdatatt":209, "dozeadmtt":1730740, "texttt":"45600"},
+{"mdatatt":216, "dozeadmtt":1827650, "texttt":"45600"},
+{"mdatatt":222, "dozeadmtt":1869770, "texttt":"45600"},
 ]
 },
@@ Linia 415: / Linia 441: @@
 	        },
 		  "update": {"fill": {"value":"#26797a"}},
+		  "hover": {"fill": {"value":"white"}},
+	      }
+	    },
+	    {
+	      "type":"symbol",
+	      "from": {"data":"tablec"},
+	      "properties": {
+	        "enter": {
+		  "x": {"scale":"x", "field":"mdatatt", "offset":0},
+		  "y": {"scale":"y", "field":"dozeadmtt"},
+	          "stroke": {"value":"#003194"},
+	          "fill": {"value":"#003194"},
+	          "size": {"value":20}
+	        },
+		  "update": {"fill": {"value":"#003194"}},
 		  "hover": {"fill": {"value":"white"}},
 	      }
@@ Linia 483: / Linia 524: @@
 		  "x": {"scale": "x", "signal": "tooltip.mdatatt"},
 		  "y": {"scale": "y", "signal": "tooltip.dozeadmtt", "offset": -10},
-		  "text": {"template": "{{tooltip.monthtt}} – {{tooltip.dozeadmtto}}"},
+		  //"text": {"template": "{{tooltip.monthtt}} – {{tooltip.dozeadmtto}}"},
+		  "text": {"template": "{{tooltip.texttt}}"},
 		  "fillOpacity": {
 		    "rule": [