Fixes: Show correct hours in a week between two month, Technical: Upd…

…ate to Vue 2.6.8
valasek · Mar 3, 2019 · 229925a · 229925a
1 parent e6dd3c8
commit 229925a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -13,7 +13,7 @@
     "babel-polyfill": "^6.26.0",
     "date-fns": "^1.30.1",
     "moment-timezone": "^0.5.23",
-    "vue": "^2.6.7",
+    "vue": "^2.6.8",
     "vue-axios": "^2.1.4",
     "vue-router": "^3.0.2",
     "vuetify": "^1.5.4",
@@ -25,14 +25,14 @@
     "@vue/cli-plugin-eslint": "^3.4.1",
     "@vue/cli-service": "^3.4.1",
     "babel-eslint": "^10.0.1",
-    "eslint": "^5.14.1",
+    "eslint": "^5.15.0",
     "eslint-config-vuetify": "^0.2.0",
     "eslint-plugin-vue": "^5.2.2",
     "npm-check": "^5.9.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "vue-cli-plugin-vuetify": "^0.4.6",
-    "vue-template-compiler": "^2.6.7",
+    "vue-template-compiler": "^2.6.8",
     "vuetify-loader": "^1.2.1"
   },
   "eslintConfig": {

diff --git a/client/src/views/ReportTable.vue b/client/src/views/ReportTable.vue
@@ -201,8 +201,8 @@
 
     computed: {
       selectedReportedHours () {
-        let from = this.dateFrom
-        let to = this.dateTo
+        const from = this.dateFrom
+        const to = this.dateTo
         return this.reportedHours.filter(function (report) {
           let d = new Date(report.date)
           return (d >= from && d <= to)

diff --git a/server/data/verification_queries b/server/data/verification_queries
@@ -0,0 +1,7 @@
+select * from reported_records
+select count(distinct id) as active from reported_records
+select count(distinct id) as deleted from reported_records where deleted_at is not null
+
+select * from reported_records where extract(MONTH from date) = '02' AND extract(YEAR from date) = '2019' AND consultant = 'Stanislav Valasek'
+select count(*) from reported_records where extract(MONTH from date) = '03' AND extract(YEAR from date) = '2019' AND consultant = 'Stanislav Valasek'
+select count(*) from reported_records where date(date) in ('2019-02-25', '2019-02-26', '2019-02-27', '2019-02-28')
diff --git a/server/models/reportedRecords.go b/server/models/reportedRecords.go
@@ -90,7 +90,7 @@ func (db *ReportedRecordManager) ReportedRecordsInMonth(year, month, consultant
 			logger.Log.Error(fmt.Sprintf("failed - get reported records for month %s, year %s and consultant %s, error: %s", month, year, consultant, err))
 			return nil
 		}
-		if err := db.db.Where("date(date) in (?)", days).Find(&borderWeeksReportedRecords); err != nil {
+		if err := db.db.Where("date(date) in (?) AND consultant = ?", days, consultant).Find(&borderWeeksReportedRecords); err != nil {
 			reportedRecords = append(reportedRecords, borderWeeksReportedRecords...)
 			return reportedRecords
 		}
@@ -136,7 +136,7 @@ func getborderDays(year, month string) (days []string, err error) {
 	}
 
 	if (sunday.Month() == monthStart.Month()) {
-		fmt.Println("sunday is also end of the month")
+		// fmt.Println("sunday is also end of the month")
 	} else {
 		for day := 1; day <= sunday.Day(); day++ {
 			days = append(days, nextYear+"-"+nextMonth+"-"+fmt.Sprintf("%02d", day))