Changeset 1651 for trunk/LATMOS-Accounts-Web/root

Timestamp:

01/22/16 06:25:19 (8 years ago)

Author:

nanardon

Message:

Update timeline

File:

• trunk/LATMOS-Accounts-Web/root/static/js/timeline/timeframe.js (modified) (6 diffs)

trunk/LATMOS-Accounts-Web/root/static/js/timeline/timeframe.js

@@ -32 +32 @@
 
                 this.outerWidth = this.container.innerWidth();
-                this.outerHeight = 100;
+                this.outerHeight = 140;
                 this.paddingX = 40;
-                this.paddingY = 20;
+                this.paddingY = 60;
 
                 this.width = this.outerWidth - (this.paddingX * 2);
@@ -112 +112 @@
         Timeline.prototype.addEvent = function (eventData, category) {
                 var event = {
-                        name: eventData.name,
-                        date: parseDateString(eventData.date)
+                        name:    eventData.name,
+                        date:    parseDateString(eventData.date),
+            options: eventData.options ? eventData.options : {},
                 };
                 category.events.push(event);
@@ -227 +228 @@
                         .appendTo(group);
 
+        var color = 
+              event.options.type == 'alarm'      ? 'red'
+            : event.options.type == 'employment' ? 'green'
+            : 'blue';
+        var labelHeigth = event.options.type == 'alarm'
+            ? 32
+            : 12;
         var line = $svg.line(
            x,
            this.height - this.options.textHeight - this.options.tickHeight + this.paddingY,
            x,
-           this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - 24
+           this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - labelHeigth
         )
-            .attr("stroke", "blue")
+            .attr("stroke", color)
             .attr("stroke-width", 1)
             .appendTo(group); 
@@ -239 +247 @@
                 var label = $svg.text(
                         x,
-                        this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - 32,
+                        this.height - this.options.textHeight - this.options.tickHeight + this.paddingY - (labelHeigth + 8),
                         event.name,
                         {
-                                fill: "blue",
+                                fill: color,
                                 "font-size": "12",
                                 "text-anchor": "middle"
@@ -248 +256 @@
                 )
                         .appendTo(group);
+
+        if (event.options.showdate) {
+            var line = $svg.line(
+                x,
+                this.height - this.options.textHeight - this.options.tickHeight + this.paddingY,
+                x,
+                this.height - this.options.textHeight - this.options.tickHeight + this.paddingY + 16
+            )
+                .attr("stroke", color)
+                .attr("stroke-width", 1)
+                .appendTo(group);
+
+            var label = $svg.text(
+                x,
+                this.height - this.options.textHeight - this.options.tickHeight + this.paddingY + 24,
+                $.datepicker.formatDate('dd/mm/yy', event.date),
+                {
+                    fill: color,
+                    "font-size": "11",
+                    "text-anchor": "middle"
+                }
+            )
+                .appendTo(group);
+        }
         };
 
@@ -275 +307 @@
                 var label = $svg.text(
                         (startX + endX) / 2,
-                        this.height + this.options.textHeight - this.options.tickHeight + this.paddingY + 8,
+                        this.height + this.options.textHeight - this.options.tickHeight + this.paddingY + 24,
                         span.name,
                         {