vhgb

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

@@ -1,6 +1,7 @@
 package com.dbs.mplus.knuh.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatRadioButton;
 import androidx.core.content.ContextCompat;
 
 import android.content.Context;
@@ -86,11 +87,11 @@ public class ConsentActivity extends AppCompatActivity {
   public CustomRadioGroup radioGroup;
   public CustomRadioGroup.LayoutParams radioGroupParams;
   public RelativeLayout.LayoutParams radioParams;
-  public RadioButton radioButton1;
-  public RadioButton radioButton2;
-  public RadioButton radioButton3;
-  public RadioButton radioButton4;
-  public RadioButton radioButton5;
+  public AppCompatRadioButton radioButton1;
+  public AppCompatRadioButton radioButton2;
+  public AppCompatRadioButton radioButton3;
+  public AppCompatRadioButton radioButton4;
+  public AppCompatRadioButton radioButton5;
   /** left Menu **/
 
 
@@ -242,6 +243,7 @@ public class ConsentActivity extends AppCompatActivity {
     tvMainDate.setText(Util.nowDate());
 
     dateLayout.setOnClickListener(leftMenu.onClickListener);
+    radioGroup.setOnCheckedChangeListener(leftMenu.onCheckedChangeListener);
 
     leftMenu.getWardList();
     leftMenu.getDeptList();

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

@@ -0,0 +1,18 @@
+diff a/app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java b/app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java	(rejected hunks)
+@@ -25,11 +25,16 @@
+ import com.dbs.mplus.knuh.BuildConfig;
+ import com.dbs.mplus.knuh.R;
+ import com.dbs.mplus.knuh.activity.activityEvent.LeftMenu;
++import com.dbs.mplus.knuh.activity.activityEvent.RightMenu;
+ 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.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.Util;
+ 
+ public class ConsentActivity extends AppCompatActivity {

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

@@ -1,7 +1,10 @@
 package com.dbs.mplus.knuh.activity.activityEvent;
 
+import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -11,6 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatRadioButton;
 import androidx.core.content.ContextCompat;
 
 import com.dbs.mplus.knuh.BuildConfig;
@@ -50,9 +54,9 @@ public class LeftMenu {
     this.dateDialog = new DatePickerDialog(context, R.style.DatePickerDialogTheme, onDateSetListener, year, month, day);
   }
 
+  @SuppressLint("RestrictedApi")
   public void setRadioGroupDraw(String indexPage) {
     instance.radioGroup = new CustomRadioGroup(mContext);
-    instance.radioGroup.setBackgroundColor(ContextCompat.getColor(mContext, R.color.darkGray));
 
     instance.radioGroupParams = new CustomRadioGroup.LayoutParams(CustomRadioGroup.LayoutParams.WRAP_CONTENT, CustomRadioGroup.LayoutParams.WRAP_CONTENT);
     instance.radioGroupParams.addRule(RelativeLayout.CENTER_IN_PARENT);
@@ -69,18 +73,30 @@ public class LeftMenu {
       radioStr4 = mContext.getString(R.string.noWrite);
 
     } else if (indexPage.equals("O")) {
-
+      radioStr1 = mContext.getString(R.string.accept);
+      radioStr2 = mContext.getString(R.string.waiting);
+      radioStr3 = mContext.getString(R.string.complete);
+      radioStr4 = mContext.getString(R.string.noWrite);
     } else if (indexPage.equals("ER")) {
-
+      radioStr1 = mContext.getString(R.string.stay);
+      radioStr2 = mContext.getString(R.string.discharge);
+      radioStr3 = mContext.getString(R.string.leaveClear);
+      radioStr4 = mContext.getString(R.string.noWrite);
     } else if (indexPage.equals("OP")) {
-
+      radioStr1 = mContext.getString(R.string.all);
+      radioStr2 = mContext.getString(R.string.notYet);
+      radioStr3 = mContext.getString(R.string.ready);
+      radioStr4 = mContext.getString(R.string.ing);
+      radioStr5 = mContext.getString(R.string.complete);
     } else if (indexPage.equals("S")) {
-
+      radioStr1 = mContext.getString(R.string.admission);
+      radioStr2 = mContext.getString(R.string.outPatient);
+      radioStr3 = mContext.getString(R.string.emergency);
     }
 
     if (indexPage.equals("OP")) {
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-      instance.radioButton1 = new RadioButton(mContext);
+      instance.radioButton1 = new AppCompatRadioButton(mContext);
       instance.radioButton1.setText(radioStr1);
       instance.radioButton1.setTextSize(14);
       instance.radioButton1.setLayoutParams(instance.radioParams);
@@ -88,7 +104,7 @@ public class LeftMenu {
 
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton1.getId());
-      instance.radioButton2 = new RadioButton(mContext);
+      instance.radioButton2 = new AppCompatRadioButton(mContext);
       instance.radioButton2.setText(radioStr2);
       instance.radioButton2.setTextSize(14);
       instance.radioButton2.setLayoutParams(instance.radioParams);
@@ -96,7 +112,7 @@ public class LeftMenu {
 
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton2.getId());
-      instance.radioButton3 = new RadioButton(mContext);
+      instance.radioButton3 = new AppCompatRadioButton(mContext);
       instance.radioButton3.setText(radioStr3);
       instance.radioButton3.setTextSize(14);
       instance.radioButton3.setLayoutParams(instance.radioParams);
@@ -104,7 +120,7 @@ public class LeftMenu {
 
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.BELOW, instance.radioButton3.getId());
-      instance.radioButton4 = new RadioButton(mContext);
+      instance.radioButton4 = new AppCompatRadioButton(mContext);
       instance.radioButton4.setText(radioStr4);
       instance.radioButton4.setTextSize(14);
       instance.radioButton4.setLayoutParams(instance.radioParams);
@@ -113,14 +129,14 @@ public class LeftMenu {
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.BELOW, instance.radioButton2.getId());
       instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton4.getId());
-      instance.radioButton5 = new RadioButton(mContext);
-      instance.radioButton5.setText("sdf");
+      instance.radioButton5 = new AppCompatRadioButton(mContext);
+      instance.radioButton5.setText(radioStr5);
       instance.radioButton5.setTextSize(14);
       instance.radioButton5.setLayoutParams(instance.radioParams);
       instance.radioGroup.addView(instance.radioButton5);
     } else {
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-      instance.radioButton1 = new RadioButton(mContext);
+      instance.radioButton1 = new AppCompatRadioButton(mContext);
       instance.radioButton1.setText(radioStr1);
       instance.radioButton1.setTextSize(14);
       instance.radioButton1.setLayoutParams(instance.radioParams);
@@ -128,7 +144,7 @@ public class LeftMenu {
 
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton1.getId());
-      instance.radioButton2 = new RadioButton(mContext);
+      instance.radioButton2 = new AppCompatRadioButton(mContext);
       instance.radioButton2.setText(radioStr2);
       instance.radioButton2.setTextSize(14);
       instance.radioButton2.setLayoutParams(instance.radioParams);
@@ -136,19 +152,22 @@ public class LeftMenu {
 
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton2.getId());
-      instance.radioButton3 = new RadioButton(mContext);
+      instance.radioButton3 = new AppCompatRadioButton(mContext);
       instance.radioButton3.setText(radioStr3);
       instance.radioButton3.setTextSize(14);
       instance.radioButton3.setLayoutParams(instance.radioParams);
       instance.radioGroup.addView(instance.radioButton3);
 
-      instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-      instance.radioParams.addRule(RelativeLayout.BELOW, instance.radioButton3.getId());
-      instance.radioButton4 = new RadioButton(mContext);
-      instance.radioButton4.setText(radioStr4);
-      instance.radioButton4.setTextSize(14);
-      instance.radioButton4.setLayoutParams(instance.radioParams);
-      instance.radioGroup.addView(instance.radioButton4);
+      if (!indexPage.equals("S")) {
+        instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+        instance.radioParams.addRule(RelativeLayout.RIGHT_OF, instance.radioButton3.getId());
+        instance.radioButton4 = new AppCompatRadioButton(mContext);
+        instance.radioButton4.setText(radioStr4);
+        instance.radioButton4.setTextSize(14);
+        instance.radioButton4.setLayoutParams(instance.radioParams);
+        instance.radioGroup.addView(instance.radioButton4);
+      }
+
     }
 
     instance.radioLayout.addView(instance.radioGroup, instance.radioGroupParams);
@@ -347,7 +366,7 @@ public class LeftMenu {
           getDoctorList(deptCd);
         } else {
           ArrayList<DoctorListVO> arrayList = new ArrayList<DoctorListVO>();
-          arrayList.add(new DoctorListVO("", "진료의(전체)", "", ""));
+          arrayList.add(new DoctorListVO("", mContext.getString(R.string.deptListEmpty), "", ""));
           setSpinnerAdapter(arrayList, ConsentConfig.GET_DOCTOR_LIST);
         }
       } else if (parent == instance.doctorSpinner) {
@@ -362,4 +381,11 @@ public class LeftMenu {
 
     }
   };
+
+  public CustomRadioGroup.OnCheckedChangeListener onCheckedChangeListener = new CustomRadioGroup.OnCheckedChangeListener() {
+    @Override
+    public void onCheckedChanged(CustomRadioGroup group, int checkedId) {
+
+    }
+  };
 }

app/src/main/res/layout/activity_left.xml

@@ -321,7 +321,7 @@
                     android:layout_weight="1"
                     android:layout_marginLeft="5dp"
                     android:singleLine="true"
-                    android:textSize="14sp"
+                    android:textSize="16sp"
                     android:inputType="number"
                     app:theme="@style/EditTextStyle"
                     style="@style/EditTextStyle"
@@ -382,24 +382,25 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-
                 android:layout_weight="1">
                 <TextView
                     android:id="@+id/column1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/patientId"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:padding="4dp"/>
                 <TextView
                     android:id="@+id/column2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/sexNage"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:paddingLeft="4dp"
+                    android:paddingBottom="4dp"
+                    android:paddingRight="4dp" />
             </LinearLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -410,18 +411,20 @@
                     android:id="@+id/column3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/dept"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:padding="4dp"/>
                 <TextView
                     android:id="@+id/column4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/patientName"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:paddingLeft="4dp"
+                    android:paddingBottom="4dp"
+                    android:paddingRight="4dp"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -432,18 +435,20 @@
                     android:id="@+id/column5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/professor"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:padding="4dp"/>
                 <TextView
                     android:id="@+id/column6"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="텍스트"
+                    android:text="@string/wardRoom"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:padding="5dp"/>
+                    android:textSize="16sp"
+                    android:paddingLeft="4dp"
+                    android:paddingBottom="4dp"
+                    android:paddingRight="4dp"/>
             </LinearLayout>
         </LinearLayout>
         <!--환자 리스트-->

app/src/main/res/values/strings.xml

@@ -41,7 +41,6 @@
     <string name="hospitalization">입원</string>
     <string name="discharge">퇴원</string>
     <string name="noWrite">미작성</string>
-    <string name="leave">퇴실</string>
     <string name="accept">접수</string>
     <string name="waiting">대기</string>
     <string name="complete">완료</string>
@@ -49,8 +48,26 @@
     <string name="ing">진행</string>
     <string name="ready">준비</string>
     <string name="notYet">미착</string>
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 15e8f64f86dc57ada2afc7df89f6d3cf7a120abd
+    <string name="leaveClear">퇴실정리</string>
+    <string name="patientId">등록번호</string>
+    <string name="sexNage">성별/나이</string>
+    <string name="dept">진료과</string>
+    <string name="patientName">환자명</string>
+    <string name="professor">담당교수</string>
+    <string name="wardRoom">병실</string>
+    <string name="opRoom">수술룸</string>
+    <string name="medicalTreatmentDate">진료일자</string>
+<<<<<<< HEAD
+=======
 
     <string name="leaveClear">퇴실</string>
+>>>>>>> parent of b6f5101... 우측 화면 뷰페이저 및 프래그먼트 추가입니다.
+=======
+>>>>>>> 15e8f64f86dc57ada2afc7df89f6d3cf7a120abd
 
     <string name="searchPatient">조회된 환자 목록이 없습니다</string>
     <string name="permissionCheck">전자동의서 로그인을 위해 파일 접근 권한 및 DeviceId 획득을 위한 전화번호 권한이 필요합니다.</string>

app/src/main/res/values/styles.xml

@@ -42,8 +42,9 @@
     </style>
 
     <style name="MyRadioButtonStyle" parent="Widget.AppCompat.CompoundButton.RadioButton">
-        <!--<item name="android:textColor">@drawable/my_compound_button_color_selector</item>-->
+        <item name="android:textColor">@drawable/radio_button_selector</item>
         <item name="buttonTint">@drawable/radio_button_selector</item>
+        <item name="android:background">@color/transparentColor</item>
     </style>
 
     <style name="JkDialog" parent="SpinKitView">