From 98f5333c6d12bcf4e0fbdc45f508b143c0a444c7 Mon Sep 17 00:00:00 2001
From: answerquest <nikhil.js@gmail.com>
Date: Sat, 31 Aug 2019 13:20:27 +0530
Subject: [PATCH] bugfix #152

---
 README.md          |  2 +-
 config/settings.js |  2 +-
 js/tripstimings.js | 19 +++++++++----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 601ddec..1f58ad0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 A browser-based user interface for creating, editing, exporting of static GTFS (General Transit Feed Specification Reference) feeds for a public transit authority.
 
-**Release Status** : V 3.4.3 (live branch may be some commits ahead)
+**Release Status** : V 3.4.4 (live branch may be some commits ahead)
 Download from [Releases page](https://github.com/WRI-Cities/static-GTFS-manager/releases/).  
 - Windows binary is available in the repo itself, just double-click GTFSManager.exe to start the program.
 - Mac, Ubuntu users can run by first installing docker, then double-clicking two scripts. See [Running with Docker on any OS](https://github.com/WRI-Cities/static-GTFS-manager/wiki/Running-with-Docker-on-any-OS)
diff --git a/config/settings.js b/config/settings.js
index dad1145..1175485 100644
--- a/config/settings.js
+++ b/config/settings.js
@@ -1,6 +1,6 @@
 // from commonfuncs.js
 
-const VERSION = 'v3.4.3';
+const VERSION = 'v3.4.4';
 const APIpath = 'API/';
 const CURRENCY = 'INR';
 // this flag tells whether it is mandatory for all UIDs to be in capitals or not.
diff --git a/js/tripstimings.js b/js/tripstimings.js
index 7dc197d..2a34658 100644
--- a/js/tripstimings.js
+++ b/js/tripstimings.js
@@ -524,7 +524,6 @@ function getPythonCalendar() {
 		if (xhr.status === 200) { //we have got a Response
 			console.log(`Loaded data from Server API/calendar .`);
 			var data = JSON.parse(xhr.responseText);
-
 			var dropdown = ''; var selectedFlag = false;
 			data.forEach(function(row){
 				var start = row['start_date'];
@@ -532,14 +531,14 @@ function getPythonCalendar() {
 				//if(!start || !end) continue; // didn't work
 
 				days = '';
-				days += ( row['monday']? 'M':'_')
-				days += ( row['tuesday']? 'T':'_')
-				days += ( row['wednesday']? 'W':'_')
-				days += ( row['thursday']? 'T':'_')
-				days += ( row['friday']? 'F':'_')
-				days += ' ';
-				days += ( row['saturday']? 'S':'_')
-				days += ( row['sunday']? 'S':'_')
+				days += ( row['monday']=='1' ? 'M':'_')
+				days += ( row['tuesday']=='1' ? 'T':'_')
+				days += ( row['wednesday']=='1'? 'W':'_')
+				days += ( row['thursday']=='1'? 'T':'_')
+				days += ( row['friday']=='1'? 'F':'_')
+				//days += ' ';
+				days += ( row['saturday']=='1'? 'Sa':'_')
+				days += ( row['sunday']=='1'? 'Su':'_')
 				
 				serviceListGlobal[row['service_id']] = row['service_id'] + ': ' + days + ', ' + start + '-' + end;
 				
@@ -548,7 +547,7 @@ function getPythonCalendar() {
 				if(!selectedFlag) {
 					select = '  selected="selected"'; selectedFlag = true;
 				}
-				dropdown += '<option value="' + row['service_id'] + '"' + select + '>' + row['service_id'] + ': ' + days + ', ' + start + '-' + end + '</option>';
+				dropdown += `<option value="${row['service_id']}"${select}>${row['service_id']}:${days}, exp.${end}</option>"`;
 			});
 			$('#trip_calendar').html(dropdown);