Master

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '25'
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "com.bhcc.app.pharmtech"
@@ -29,4 +29,6 @@ dependencies {
     compile 'com.android.support:design:24.2.0'
     compile 'com.github.clans:fab:1.6.4'
     compile 'com.android.support:support-v13:24.2.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+
 }

app/src/main/java/com/bhcc/app/pharmtech/AboutFragment.java

@@ -0,0 +1,45 @@
+package com.bhcc.app.pharmtech;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+/**
+ * Created by steven
+ * a rather simple fragment which will bring up the ABOUT section of the menu
+ * i put a test string in there until we figure out what exactly NEEDS to be placed in about
+ * section
+ */
+
+public class AboutFragment extends Fragment {
+    private LinearLayout linearLayout;
+    private TextView tvAbout;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+    }
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState){
+        View view = inflater.inflate(R.layout.fragment_about, container, false);
+        linearLayout = (LinearLayout) view.findViewById(R.id.about_linear_layout);
+        tvAbout = (TextView) view.findViewById(R.id.about_text_view);
+        return view;
+    }
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        tvAbout.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+        tvAbout.setPadding(10, 20, 10, 20);
+        tvAbout.setGravity(Gravity.CENTER_HORIZONTAL);
+
+        //linearLayout.addView(tvLegal);
+    }
+}

app/src/main/java/com/bhcc/app/pharmtech/DrugOfTheDay.java

@@ -0,0 +1,73 @@
+package com.bhcc.app.pharmtech;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/**
+ * Created by soufiane on 11/13/17.
+ */
+
+public class DrugOfTheDay extends SQLiteOpenHelper {
+
+    public static final String DATABASE_NAME = "DRUGS.db";
+    public static final String TABLE_NAME = "TopDrugs";
+    public static final String COL_1 = "GenericName";
+    public static final String COL_2 = "NAME";
+
+
+    public DrugOfTheDay(Context context) {
+        super(context, DATABASE_NAME, null, 1);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("create table " + TABLE_NAME +" (ID INTEGER PRIMARY KEY AUTOINCREMENT,NAME TEXT,SURNAME TEXT,MARKS INTEGER)");
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS "+TABLE_NAME);
+        onCreate(db);
+    }
+
+    public boolean insertData(String name,String surname,String marks) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(COL_2,name);
+        long result = db.insert(TABLE_NAME,null ,contentValues);
+        if(result == -1)
+            return false;
+        else
+            return true;
+    }
+
+    public Cursor getAllData() {
+        SQLiteDatabase db = this.getWritableDatabase();
+        Cursor res = db.rawQuery("select * from "+TABLE_NAME,null);
+        return res;
+    }
+
+    public Cursor getDrugOfDay() {
+        SQLiteDatabase db = this.getWritableDatabase();
+        Cursor res = db.rawQuery("SELECT * FROM TopDrugs WHERE TopDrugs.wasDrugOfDay LIKE 'NO'  ORDER BY RANDOM() LIMIT 1",null);
+        return res;
+    }
+
+    public boolean updateData(String id,String name,String surname,String marks) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(COL_1,id);
+        contentValues.put(COL_2,name);
+        db.update(TABLE_NAME, contentValues, "ID = ?",new String[] { id });
+        return true;
+    }
+
+    public Integer deleteData (String id) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        return db.delete(TABLE_NAME, "ID = ?",new String[] {id});
+    }
+
+}

app/src/main/java/com/bhcc/app/pharmtech/LegalFragment.java

@@ -0,0 +1,45 @@
+package com.bhcc.app.pharmtech;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+/**
+ * Created by steven
+ * a rather simple fragment which will bring up the LEGAL section of the menu
+ * i put a test string in there until we figure out what exactly NEEDS to be placed in legal
+ * section
+ */
+
+public class LegalFragment extends Fragment {
+    private LinearLayout linearLayout;
+    private TextView tvLegal;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+    }
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState){
+        View view = inflater.inflate(R.layout.fragment_legal, container, false);
+        linearLayout = (LinearLayout) view.findViewById(R.id.legal_linear_layout);
+        tvLegal = (TextView) view.findViewById(R.id.legal_text_view);
+        return view;
+    }
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        tvLegal.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+        tvLegal.setPadding(10, 20, 10, 20);
+        tvLegal.setGravity(Gravity.CENTER_HORIZONTAL);
+
+        //linearLayout.addView(tvLegal);
+    }
+}

app/src/main/java/com/bhcc/app/pharmtech/data/MedicineBaseHelper.java

@@ -16,7 +16,8 @@
 
 public class MedicineBaseHelper extends SQLiteOpenHelper {
 
-    private static String DB_NAME = "TopDrugs.db";
+    private static String DB_NAME = "DRUGS.db";
+
 
     private SQLiteDatabase myDataBase;
 

app/src/main/java/com/bhcc/app/pharmtech/data/MedicineLab.java

@@ -1,14 +1,16 @@
 package com.bhcc.app.pharmtech.data;
 
-
-import com.bhcc.app.pharmtech.data.model.Medicine;
+//git test commit
+//steven testing git pushing
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.bhcc.app.pharmtech.data.model.Medicine;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -173,6 +175,7 @@ public List<Medicine> getMedicinesWithRawSql(String rawSql, String[] whereArgs)
      * To get study topics
      * @return List of Study Topics
      */
+    //This is called by FilterFragment, when getting a list of study topics -sc
     public List<String> getStudyTopics() {
         MedicineCursorWrapper cursor = rawQueryCrimes(
                 "SELECT DISTINCT " + MedicineSchema.MedicineTable.Cols.STUDY_TOPIC + " FROM " +
@@ -237,6 +240,7 @@ private MedicineCursorWrapper rawQueryCrimes(String rawSql, String[] whereArgs)
      * @param whereArgs
      * @param orderBy
      */
+    //called by FilterFragment to returned SQL vals
     public void updateMedicineLab(String whereClause, String[] whereArgs, String orderBy) {
         MedicineCursorWrapper cursor = queryCrimes(whereClause, whereArgs, orderBy);
 

app/src/main/java/com/bhcc/app/pharmtech/data/NoteLab.java

@@ -30,7 +30,7 @@ public class NoteLab {
     private static NoteLab NoteLab;
     private Context mContext;
     private SQLiteDatabase mDatabase;
-    private static String DB_NAME = "TopDrugs.db";
+    private static String DB_NAME = "DRUGS.db";
 
     /**
      *