From aeda1229f8cb6b66545d41a8a15f9fffe0c1932b Mon Sep 17 00:00:00 2001
From: Chris Vanderloo <chris.vanderloo@yahoo.com>
Date: Mon, 29 Apr 2019 01:04:29 -0400
Subject: [PATCH] fix import_data

---
 app.json            |  4 +---
 data/import_data.js | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app.json b/app.json
index 62d0b7d..e21c4c2 100644
--- a/app.json
+++ b/app.json
@@ -23,9 +23,7 @@
       "**/*"
     ],
     "ios": {
-      "supportsTablet": true
-    },
-    "ios": {
+      "supportsTablet": true,
       "bundleIdentifier": "com.schedj.schedj"
     },
     "android": {
diff --git a/data/import_data.js b/data/import_data.js
index 9c1c9c1..e423a3f 100644
--- a/data/import_data.js
+++ b/data/import_data.js
@@ -1,3 +1,4 @@
+/*  eslint no-restricted-syntax: "off"  */
 import { EventRegister } from 'react-native-event-listeners';
 import moment from 'moment';
 import globals from '../globals';
@@ -6,15 +7,19 @@ import translateTerm from './translate_term';
 
 function calculateGPA(data) {
   const grades = [];
-  for (const entry in data) if (entry != 'loaded') grades.push({ term: translateTerm(entry), content: data[entry] });
+  for (const entry in data) if (entry !== 'loaded') grades.push({ term: translateTerm(entry), content: data[entry] });
   grades.sort().reverse();
   if (grades) {
     let total = 0;
     let earned = 0;
     for (const i in grades) {
-      for (const j in grades[i].content) {
-        total += parseFloat(grades[i].content[j].GPA_HRS);
-        earned += parseFloat(grades[i].content[j].POINTS);
+      if (Object.prototype.hasOwnProperty.call(grades, i)) {
+        for (const j in grades[i].content) {
+          if (Object.prototype.hasOwnProperty.call(grades[i].content, j)) {
+            total += parseFloat(grades[i].content[j].GPA_HRS);
+            earned += parseFloat(grades[i].content[j].POINTS);
+          }
+        }
       }
     }
     return Number((earned / total).toFixed(2));
@@ -24,9 +29,11 @@ function calculateGPA(data) {
 
 function getNextClass() {
   for (const i in globals.SCHEDULE.today) {
-    const cl = globals.SCHEDULE.today[i];
-    const next = moment(cl.start_time, 'h:mm a');
-    if (moment().isBefore(next)) return cl;
+    if (Object.prototype.hasOwnProperty.call(globals.SCHEDULE.today, i)) {
+      const cl = globals.SCHEDULE.today[i];
+      const next = moment(cl.start_time, 'h:mm a');
+      if (moment().isBefore(next)) return cl;
+    }
   }
   return null;
 }
-- 
2.51.2