!!!

app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java

@@ -3,7 +3,6 @@ package com.dbs.mplus.knuh.activity;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatRadioButton;
 import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
 import android.content.Context;
@@ -15,7 +14,6 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -34,13 +32,11 @@ import com.dbs.mplus.knuh.activity.activityEvent.TapMenu;
 import com.dbs.mplus.knuh.activity.activityEvent.TopMenu;
 import com.dbs.mplus.knuh.adapter.ViewPagerAdapter;
 import com.dbs.mplus.knuh.consent.sign.SignWrapper;
-import com.dbs.mplus.knuh.customView.CustomAlertDialog;
 import com.dbs.mplus.knuh.customView.CustomRadioGroup;
 import com.dbs.mplus.knuh.customView.LoadingProgress;
 import com.dbs.mplus.knuh.fragment.HistoryFragment;
 import com.dbs.mplus.knuh.fragment.MarkerFragment;
 import com.dbs.mplus.knuh.fragment.SearchFragment;
-import com.dbs.mplus.knuh.util.ConsentConfig;
 import com.dbs.mplus.knuh.util.Util;
 
 public class ConsentActivity extends AppCompatActivity {
@@ -49,7 +45,6 @@ public class ConsentActivity extends AppCompatActivity {
   public AppCompatActivity mActivity;
   public Context mContext;
   private LoadingProgress loadingProgress;
-  private CustomAlertDialog csAlert;
   private TopMenu topMenu;
   private TapMenu tapMenu;
   private LeftMenu leftMenu;
@@ -107,10 +102,7 @@ public class ConsentActivity extends AppCompatActivity {
   public AppCompatRadioButton radioButton5;
 
   public EditText etPatientId;
-  public CheckBox chkMyPatient;
   public LinearLayout patientSearchLayout;
-  public RecyclerView patientRecyclerView;
-  public TextView patientEmpty;
   /** left Menu **/
 
   /** Right Menu **/
@@ -149,7 +141,6 @@ public class ConsentActivity extends AppCompatActivity {
     mContext  = this;
 
     loadingProgress = new LoadingProgress(mContext);
-    csAlert = new CustomAlertDialog(mContext);
     topMenu  = new TopMenu(mContext, mActivity);
     tapMenu  = new TapMenu(mContext, mActivity);
     leftMenu = new LeftMenu(mContext, mActivity);
@@ -269,10 +260,7 @@ public class ConsentActivity extends AppCompatActivity {
     radioLayout = (RelativeLayout) findViewById(R.id.radioLayout);
 
     etPatientId = (EditText) findViewById(R.id.etPatientId);
-    chkMyPatient = (CheckBox) findViewById(R.id.chkMyPatient);
     patientSearchLayout = (LinearLayout) findViewById(R.id.patientSearchLayout);
-    patientRecyclerView = (RecyclerView) findViewById(R.id.patientRecyclerView);
-    patientEmpty = (TextView) findViewById(R.id.patientEmpty);
 
     leftMenu.setRadioGroupDraw(indexPage);
 
@@ -280,18 +268,6 @@ public class ConsentActivity extends AppCompatActivity {
       wardLayout.setVisibility(View.INVISIBLE);
     }
 
-    // 내 환자는 입원에 의사직군이 아닌 사용자만 보임
-    if (indexPage.equals("I")) {
-      // 03이면 의사 직군
-      if (jobKindCd.indexOf("03") == 0) {
-        chkMyPatient.setVisibility(View.GONE);
-      } else {
-        chkMyPatient.setVisibility(View.VISIBLE);
-      }
-    } else {
-      chkMyPatient.setVisibility(View.VISIBLE);
-    }
-
     tvMainDate.setText(Util.nowDate());
 
     dateLayout.setOnClickListener(leftMenu.onClickListener);
@@ -313,11 +289,12 @@ public class ConsentActivity extends AppCompatActivity {
     viewPager     = (ViewPager) findViewById(R.id.viewPager);
     /** RightTab **/
 
-    setViewPager();
-    rightMenu.rightMenuStartColor();
     historyLayout.setOnClickListener(rightMenu.onClickListener);
     markerLayout.setOnClickListener(rightMenu.onClickListener);
     searchLayout.setOnClickListener(rightMenu.onClickListener);
+
+    setViewPager();
+    rightMenu.rightMenuStartColor();
   }
 
   public void setViewPager() {
@@ -366,17 +343,6 @@ public class ConsentActivity extends AppCompatActivity {
     }
   }
 
-  public void showSingButtonDialog(String message) {
-    csAlert.show();
-    csAlert.setContent(message, ConsentConfig.ALERT_BTN_TYPE);
-    csAlert.btnConfirm2.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        csAlert.dismiss();
-      }
-    });
-  }
-
   @Override
   public void onBackPressed() {
     if(System.currentTimeMillis() > backKeyPressedTime + 2000) {

app/src/main/java/com/dbs/mplus/knuh/activity/activityEvent/RightMenu.java

@@ -9,17 +9,20 @@ import android.view.View;
 import com.dbs.mplus.knuh.R;
 import com.dbs.mplus.knuh.activity.ConsentActivity;
 
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
 
 public class RightMenu {
 
+  private static final String TAG = "RightMenu";
   private AppCompatActivity mActivity;
   private Context           mContext;
   private ConsentActivity   instance;
 
 
+
   public RightMenu(Context context, AppCompatActivity activity) {
 
     this.mActivity = activity;
@@ -61,13 +64,11 @@ public class RightMenu {
   }
 
   public void rightMenuColorChange(int position) {
-
     GradientDrawable historyBg = (GradientDrawable) instance.historyLayout.getBackground();
     GradientDrawable markerBg = (GradientDrawable) instance.markerLayout.getBackground();
     GradientDrawable searchBg = (GradientDrawable) instance.searchLayout.getBackground();
 
     if (position == 0) {
-
       historyBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
       instance.tvRightHistory.setTextColor(ContextCompat.getColor(mContext, R.color.black));
       instance.tvRightHistory.setTypeface(null, Typeface.BOLD);
@@ -81,7 +82,6 @@ public class RightMenu {
       instance.tvRightSearch.setTypeface(null, Typeface.NORMAL);
 
     } else if (position == 1) {
-
       markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
       instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.black));
       instance.tvRightMarker.setTypeface(null, Typeface.BOLD);
@@ -95,7 +95,6 @@ public class RightMenu {
       instance.tvRightSearch.setTypeface(null, Typeface.NORMAL);
 
     } else if (position == 2) {
-
       searchBg.setColorFilter(ContextCompat.getColor(mContext, R.color.white), PorterDuff.Mode.SRC_ATOP);
       instance.tvRightSearch.setTextColor(ContextCompat.getColor(mContext, R.color.black));
       instance.tvRightSearch.setTypeface(null, Typeface.BOLD);
@@ -107,7 +106,6 @@ public class RightMenu {
       markerBg.setColorFilter(ContextCompat.getColor(mContext, R.color.settingBtn), PorterDuff.Mode.SRC_ATOP);
       instance.tvRightMarker.setTextColor(ContextCompat.getColor(mContext, R.color.white));
       instance.tvRightMarker.setTypeface(null, Typeface.NORMAL);
-
     }
   }
 }

app/src/main/java/com/dbs/mplus/knuh/adapter/CategoryAdapter.java

@@ -0,0 +1,76 @@
+package com.dbs.mplus.knuh.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.dbs.mplus.knuh.BuildConfig;
+import com.dbs.mplus.knuh.R;
+import com.dbs.mplus.knuh.fragment.SearchFragment;
+import com.dbs.mplus.knuh.model.CategoryVO;
+
+import java.util.ArrayList;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class CategoryAdapter extends BaseAdapter {
+
+  private AppCompatActivity mActivity;
+  private ArrayList arrayList;
+
+  public CategoryAdapter(AppCompatActivity mActivity, ArrayList arrayList) {
+    this.mActivity = mActivity;
+    this.arrayList = arrayList;
+  }
+
+  @Override
+  public int getCount() {
+    return arrayList.size();
+  }
+
+  @Override
+  public Object getItem(int position) {
+    return arrayList.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return position;
+  }
+
+  class ViewHolder {
+    public TextView tvTitle;
+  }
+
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+
+    View v = convertView;
+    ViewHolder holder = null;
+    CategoryVO categoryVO = null;
+
+    if (v == null) {
+      holder = new ViewHolder();
+      v = LayoutInflater.from(parent.getContext()).inflate(R.layout.spinner_layout, parent, false);
+      holder.tvTitle = (TextView) v.findViewById(R.id.spinnerTarget);
+
+      v.setTag(holder);
+    } else {
+      holder = (ViewHolder) v.getTag();
+    }
+
+    String textNm = "";
+    categoryVO = (CategoryVO) arrayList.get(position);
+    textNm = categoryVO.getCategoryName();
+
+
+    holder.tvTitle.setText(textNm);
+
+    return v;
+  }
+
+}
+

app/src/main/java/com/dbs/mplus/knuh/fragment/SearchFragment.java

@@ -5,23 +5,52 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
 
+import com.dbs.mplus.knuh.BuildConfig;
 import com.dbs.mplus.knuh.R;
+import com.dbs.mplus.knuh.adapter.CategoryAdapter;
+import com.dbs.mplus.knuh.httpTask.CallBack;
+import com.dbs.mplus.knuh.httpTask.SoapParser;
+import com.dbs.mplus.knuh.model.CategoryVO;
+import com.dbs.mplus.knuh.util.ConsentConfig;
+import com.dbs.mplus.knuh.util.Util;
+
+import org.ksoap2.serialization.SoapObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class SearchFragment extends Fragment {
 
-  public SearchFragment() {
+  private static final String TAG = "SearchFragment";
+
+  private AppCompatActivity mActivity;
+  private Context mContext;
 
+  private CategoryAdapter categoryAdapter;
+
+  private Spinner      searchHospitalSpinner;
+  private Spinner      searchDeptSpinner;
+  private LinearLayout searchHospitalLayout;
+  private LinearLayout searchDeptLayout;
+
+  public SearchFragment() {
   }
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    mContext  = getActivity();
+    mActivity = (AppCompatActivity) getActivity();
   }
 
 
@@ -31,7 +60,103 @@ public class SearchFragment extends Fragment {
 
     View view = (View) inflater.inflate(R.layout.activity_search_fragment, container, false);
 
+    searchHospitalLayout  = (LinearLayout) view.findViewById(R.id.searchHospitalLayout);
+    searchDeptLayout      = (LinearLayout) view.findViewById(R.id.searchDeptLayout);
+    searchDeptSpinner     = (Spinner) view.findViewById(R.id.searchDeptSpinner);
+    searchHospitalSpinner = (Spinner) view.findViewById(R.id.searchHospitalSpinner);
+
+    getHospitalList("1");
+
     return view;
+  }
+
+  private void getHospitalList(final String categoryId) {
+    CallBack callBack = new CallBack() {
+      @Override
+      public void result(SoapObject result) {
+        Log.e(TAG, "getHospitalList --> " + result);
+        if (result == null || result.toString().indexOf("null") > 0) {
+          stop();
+        } else {
+          ArrayList<CategoryVO> arrayList = SoapParser.getHospitalList(result);
+          if (arrayList.size() == 0) {
+            stop();
+          } else {
+            setSpinnerAdapter(arrayList, categoryId);
+          }
 
+          for (int i = 0; i < arrayList.size(); i++) {
+            CategoryVO categoryVO = arrayList.get(i);
+            String categoryId = categoryVO.getCategoryId();
+            if (categoryId.equals("EMA_" + BuildConfig.INST_CD)) {
+              getHospitalRowList(categoryId);
+            }
+          }
+        }
+      }
+      @Override
+      public void stop() {
+//        ArrayList<CategoryVO> arrayList = new ArrayList<CategoryVO>();
+//        arrayList.add(new CategoryVO("", "", "전체"));
+//        setSpinnerAdapter(arrayList);
+      }
+      @Override
+      public void error() {
+
+      }
+    };
+
+    HashMap<String, String> mData = new HashMap<String, String>();
+    mData.put("categoryId", categoryId);
+    Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.GET_CONSENT_CATEGORYY, mData, callBack);
   }
+
+  private void getHospitalRowList(final String categoryId) {
+    CallBack callBack = new CallBack() {
+      @Override
+      public void result(SoapObject result) {
+        Log.e(TAG, "RowListResult --> " + result);
+        if (result == null || result.toString().indexOf("null") > 0) {
+          stop();
+        } else {
+          ArrayList<CategoryVO> arrayList = SoapParser.getHospitalList(result);
+          setSpinnerAdapter(arrayList, categoryId);
+        }
+      }
+
+      @Override
+      public void stop() {
+
+      }
+
+      @Override
+      public void error() {
+
+      }
+    };
+
+    HashMap<String, String> mData = new HashMap<String, String>();
+    mData.put("categoryId", categoryId);
+    Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.GET_CONSENT_CATEGORYY, mData, callBack);
+  }
+
+  private void setSpinnerAdapter(final ArrayList arrayList, final String categoryId) {
+    mActivity.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        categoryAdapter = new CategoryAdapter(mActivity, arrayList);
+
+        if (!categoryId.equals("EMA_" + BuildConfig.INST_CD)) {
+          searchHospitalSpinner.setAdapter(categoryAdapter);
+        }
+        if (categoryId.equals("EMA_" + BuildConfig.INST_CD)) {
+          searchDeptSpinner.setAdapter(categoryAdapter);
+        }
+      }
+    });
+  }
+
+
+
+
 }

app/src/main/java/com/dbs/mplus/knuh/httpTask/SoapParser.java

@@ -2,9 +2,9 @@ package com.dbs.mplus.knuh.httpTask;
 
 import android.util.Log;
 
+import com.dbs.mplus.knuh.model.CategoryVO;
 import com.dbs.mplus.knuh.model.DeptListVO;
 import com.dbs.mplus.knuh.model.DoctorListVO;
-import com.dbs.mplus.knuh.model.PatientListVO;
 import com.dbs.mplus.knuh.model.UserLoginDeptList;
 import com.dbs.mplus.knuh.util.ConsentConfig;
 
@@ -122,6 +122,8 @@ public class SoapParser {
 
     return arrayList;
   }
+<<<<<<< Updated upstream
+=======
 
   public static ArrayList<PatientListVO> getPatientList(SoapObject object) {
     ArrayList<PatientListVO> arrayList = new ArrayList<PatientListVO>();
@@ -160,4 +162,36 @@ public class SoapParser {
 
     return arrayList;
   }
+
+  public static ArrayList<CategoryVO> getHospitalList(SoapObject object) {
+
+    ArrayList<CategoryVO> arrayList = new ArrayList<CategoryVO>();
+
+    int total = 0;
+    if (object != null) {
+      total = object.getPropertyCount();
+      if(total == 1) {
+        if(object.getProperty(0) == null) {
+          total = 0;
+        }
+      }
+    }
+
+    if(total == 0) {
+    } else {
+      for(int i = 0; i < total; i++) {
+        SoapObject so = (SoapObject) object.getProperty(i);
+
+        String categoryType = so.getProperty("CategoryType").toString().trim();
+        String categoryId   = so.getProperty("CategoryId").toString().trim();
+        String categoryName = so.getProperty("CategoryName").toString().trim();
+
+        arrayList.add(new CategoryVO(categoryType, categoryId, categoryName));
+
+      }
+    }
+
+    return arrayList;
+  }
+>>>>>>> Stashed changes
 }

app/src/main/java/com/dbs/mplus/knuh/model/CategoryVO.java

@@ -0,0 +1,39 @@
+package com.dbs.mplus.knuh.model;
+
+public class CategoryVO {
+
+  private String categoryType = "";
+  private String categoryId   = "";
+  private String categoryName = "";
+
+  public CategoryVO(String categoryType, String categoryId, String categoryName) {
+    this.categoryType = categoryType;
+    this.categoryId = categoryId;
+    this.categoryName = categoryName;
+  }
+
+  public String getCategoryType() {
+    return categoryType;
+  }
+
+  public void setCategoryType(String categoryType) {
+    this.categoryType = categoryType;
+  }
+
+  public String getCategoryId() {
+    return categoryId;
+  }
+
+  public void setCategoryId(String categoryId) {
+    this.categoryId = categoryId;
+  }
+
+  public String getCategoryName() {
+    return categoryName;
+  }
+
+  public void setCategoryName(String categoryName) {
+    this.categoryName = categoryName;
+  }
+
+}