Merge branch 'rayven-branch' of https://github.com/limciana/UPCC into…

… rayven-branch
limciana · Mar 23, 2018 · b49597f · b49597f
2 parents fae1554 + b87304b
commit b49597f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Android Studio Files/app/src/main/java/com/cs192/upcc/InputSubjectFragment.java b/Android Studio Files/app/src/main/java/com/cs192/upcc/InputSubjectFragment.java
@@ -198,7 +198,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
           /* Pass title to the activity, receive curriculum from the activity */
           passTitle("Mark Subjects");
           curriculum = ((MainDrawer) getActivity()).getCurriculum();
-          Log.d("curriculum", curriculum.getName());
+          //Log.d("curriculum", curriculum.getName());
           // Inflate the layout for this fragment
           UPCCdb = new DatabaseHelper(getActivity());
           UPCCdb.createDB();

diff --git a/Android Studio Files/app/src/main/java/com/cs192/upcc/SelectCurriculumFragment.java b/Android Studio Files/app/src/main/java/com/cs192/upcc/SelectCurriculumFragment.java
@@ -135,7 +135,6 @@ public void onAttach(Context context) {
      @Override
      public void onDetach() {
           super.onDetach();
-          getCurriculumFromList(false);
      }
 
      /*
@@ -230,7 +229,6 @@ public void onClick(View view) {
           /* Setup the first curriculum to be the default on start of the activity */
           CheckBox init = v.findViewById(1);
           init.toggle();
-          getCurriculumFromList(false);
           return v;
      }
      /*