Merge pull request #436 from Pewillia/356-line-chart-yyyy-date-format-b

fix(356) add dates in YYYY format
fgpv-vpgf · Jul 29, 2022 · 06f3907 · 06f3907
2 parents c84ecad + aa8da50
commit 06f3907
Show file tree

Hide file tree

Showing 5 changed files with 1,823 additions and 7 deletions.
diff --git a/chart/src/chart-loader.ts b/chart/src/chart-loader.ts
@@ -493,12 +493,14 @@ export class ChartLoader {
                         } else if (data.type === 'combine') {
                             let parseCombValues = parse.replace(new RegExp(data.regex, 'g'), '*').split('*').filter(Boolean);
                             let numberPattern = /\d+/g;
-                            parsed.isDateTimeObjForXAxis = (parseCombValues.filter(q=>{
-                                let time: any = parseInt(q.split('T')[1].split(data.split)[0].match(numberPattern).join(''));
-                                if (time > 0) {
-                                    return true;
-                                }
-                            })).length > 0;
+                            if (parseCombValues.includes("T")) {
+                                parsed.isDateTimeObjForXAxis = (parseCombValues.filter(q => {
+                                    let time: any = parseInt(q.split('T')[1].split(data.split)[0].match(numberPattern).join(''));
+                                    if (time > 0) {
+                                        return true;
+                                    }
+                                })).length > 0;
+                            }
                             for (let val of parseCombValues) {
                                 let splitVal = val.split(data.split);
 

diff --git a/chart/src/chart-parser.ts b/chart/src/chart-parser.ts
@@ -143,7 +143,13 @@ export class ChartParser {
 
         data.features.forEach((feat: any) => {
             if (typeof attrValue === 'undefined' || attrValue === feat.attributes[layerConfig.data[index].values]) {
-                values.push(`(${new Date(feat.attributes[layerConfig.data[index].date]).toJSON()},${feat.attributes[layerConfig.data[index].measure]})`);
+                 if (String(feat.attributes[layerConfig.data[index].date]).length === 4) {
+                    feat.attributes[layerConfig.data[index].date] = Number(feat.attributes[layerConfig.data[index].date]);
+            }
+            if (String(feat.attributes[layerConfig.data[index].date]).length === 4) 
+                    values.push(`(${(feat.attributes[layerConfig.data[index].date])},${feat.attributes[layerConfig.data[index].measure]})`)
+            else 
+                    values.push(`(${new Date(feat.attributes[layerConfig.data[index].date]).toJSON()},${feat.attributes[layerConfig.data[index].measure]})`);   
             }
         });
 

diff --git a/chart/src/samples/chart-index.html b/chart/src/samples/chart-index.html
@@ -38,6 +38,8 @@
                     <option value="Bar-chart-link.json">11. Substance Selector</option>
                     <option value="Environmental_dosimetry_linechart_en.json">12. Environmental dosimetry linechart.json</option>
                     <option value="fpsn_chart_en.json">13. Real-time Environmental Radioactivity Monitoring in Canada</option>
+                    <option value="v6-1_line_date_chart.json">14. YYYY date x axis Environmental Radioactivity Monitoring in Canada</option>
+                    <option value="v6-1_line_linear_chart.json">15. YYYY linear x axis Environmental Radioactivity Monitoring in Canada</option>    
                 </select>
             </div>
          </section>