Merge pull request #435 from Intelehealth/revert-432-Issue407

Revert "Issue407"
Intelehealth · Feb 8, 2018 · c03bfcb · c03bfcb
2 parents 5f147e0 + fb721f1
commit c03bfcb
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 711 deletions.
diff --git a/.idea/dictionaries/ninja.xml b/.idea/dictionaries/ninja.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
 
-
-
 android {
     compileSdkVersion 25
     buildToolsVersion '26.0.2'

diff --git a/...ava/io/intelehealth/client/activities/identification_activity/IdentificationActivity.java b/...ava/io/intelehealth/client/activities/identification_activity/IdentificationActivity.java
diff --git a/app/src/main/java/io/intelehealth/client/objects/Patient.java b/app/src/main/java/io/intelehealth/client/objects/Patient.java
@@ -26,7 +26,6 @@ public class Patient {
     private String economic_status;
     private String education_level;
     private String caste;
-
     private String department;
     private String commune;
 
@@ -35,7 +34,6 @@ public class Patient {
     private  String patient_status;
 
 
-
     public Integer getId() {
         return id;
     }
@@ -132,44 +130,12 @@ public void setCityVillage(String city_village) {
 
     public String getStateProvince() {
         return state_province;
-
     }
 
     public void setStateProvince(String state_province) {
         this.state_province = state_province;
     }
 
-
-    public String getPatientStatus(){
-        return patient_status;
-    }
-    public void setPatientStatus(String patient_status){
-        this.patient_status = patient_status;
-    }
-
-
-    public String getCellNo(){
-        return cell_no;
-    }
-    public void setCellNo(String cell_no){
-        this.cell_no= cell_no;
-    }
-
-    public String getCommune(){
-        return commune;
-    }
-    public void setCommune(String commune){
-        this.commune=commune;
-    }
-
-
-    public String getPrisonName(){
-        return prison_name;
-    }
-
-    public void setPrisonName(String prison_name){
-        this.prison_name = prison_name;
-    }
     public String getPostalCode() {
         return postal_code;
     }

diff --git a/app/src/main/java/io/intelehealth/client/services/PrescriptionDownloadService.java b/app/src/main/java/io/intelehealth/client/services/PrescriptionDownloadService.java
@@ -177,8 +177,6 @@ protected void onHandleIntent(@Nullable Intent intent) {
                                 } else {
                                     doctorName = providerName;
                                 }
-//                                Log.d(doctorName);
-                                Log.d("DoctorName",doctorName);
 
                                 Log.i(TAG, "onHandleIntent: pn "+ providerName);
 

diff --git a/app/src/main/res/layout/content_identification.xml b/app/src/main/res/layout/content_identification.xml
@@ -178,50 +178,6 @@
                     />
 
             </android.support.design.widget.TextInputLayout>
-
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText
-                    android:id="@+id/identification_ageInMonths"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:hint="@string/identification_screen_prompt_ageInMonths"
-                    android:imeOptions="actionUnspecified"
-                    android:inputType="number"
-                    android:maxLines="1"
-                    android:singleLine="true"
-
-
-                    />
-
-            </android.support.design.widget.TextInputLayout>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
@@ -317,8 +273,6 @@
 
             </android.support.design.widget.TextInputLayout>
 
-            <!--Department-->
-
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -331,7 +285,7 @@
 
                     <EditText
                         android:id="@+id/identification_state"
-                        android:layout_width="150dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="3"
                         android:clickable="false"
@@ -346,7 +300,7 @@
 
                     <Spinner
                         android:id="@+id/spinner_state"
-                        android:layout_width="200dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
                 </LinearLayout>
@@ -355,7 +309,7 @@
             </android.support.design.widget.TextInputLayout>
 
 
-            <!--commmune-->
+
 
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
@@ -458,76 +412,14 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
 
-
                         >
 
                     </Spinner>
 
                 </LinearLayout>
             </android.support.design.widget.TextInputLayout>
 
-
-            <!--add cell number-->
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width = "match_parent"
-                android:layout_height = "wrap_content">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                <EditText
-                    android:id="@+id/identification_cell_number"
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="3"
-                    android:clickable="false"
-                    android:cursorVisible="false"
-                    android:focusable="false"
-                    android:focusableInTouchMode="false"
-                    android:freezesText="true"
-                    android:imeOptions="actionUnspecified"
-                    android:inputType="textCapWords"
-                    android:text="@string/identification_screen_cell_number"
-
-                    />
-                    <Spinner
-                        android:id="@+id/spinner_cell_number"
-                        android:layout_width="200dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-
-                        >
-
-                    </Spinner>
-
-                </LinearLayout>
-            </android.support.design.widget.TextInputLayout>
-
-
-
-
-            <!--<android.support.design.widget.TextInputLayout-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content">-->
-
-                <!--<AutoCompleteTextView-->
-                    <!--android:id="@+id/identification_commune"-->
-                    <!--android:layout_width="fill_parent"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:freezesText="true"-->
-                    <!--android:hint="@string/identification_screen_prompt_commune"-->
-                    <!--android:imeOptions="actionUnspecified"-->
-                    <!--android:inputType="textCapWords"-->
-                    <!--android:maxLines="1" />-->
-
-            <!--</android.support.design.widget.TextInputLayout>-->
-
-
-
             <!--add prison name-->
-
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -610,7 +502,6 @@
             </android.support.design.widget.TextInputLayout>
 
 
-
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">