kenya_audit_remark

GSKMTOrange/build.gradle

@@ -27,8 +27,8 @@ android {
         versionName "4.3"*/
 
         //For UAE
-        versionCode 28
+      /*  versionCode 29
-        versionName "4.0"
+        versionName "4.1"*/
 
         //For Turkey
      /*   versionCode 26
@@ -41,16 +41,17 @@ android {
        /* versionCode 27
         versionName "3.8"*/
 
-        //For SA
+
+        //sa
+     /*  versionCode 27
+        versionName "3.8"*/
+
         /*versionCode 28
         versionName "3.9"*/
-        //sa
-       versionCode 22
-        versionName "3.4"
 
         //Kenya
-       /* versionCode 2
+        versionCode 2
-        versionName "1.1"*/
+        versionName "1.1"
         //nigeria
         /* versionCode 1
          versionName "1.0"*/

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -96,7 +96,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB617";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB618";
     public static final int DATABASE_VERSION = 16;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -6011,6 +6011,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
                 values.put("NO_OF_CAMERA", data.getNO_OF_CAMERA().get(i));
                 values.put("QTYPE", data.getTYPE().get(i));
+                values.put("REMARK_ALLOW", data.getREMARK_ALLOW().get(i));
+                values.put("REMARK_LEVEL", data.getREMARK_LEVEL().get(i));
 
                 db.insert("ADDITIONAL_QUESTION", null, values);
             }
@@ -6043,6 +6045,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                             .getColumnIndexOrThrow("KEYACCOUNT_ID")));
                     sb.setCHECK_TYPE(cursordata.getString(cursordata
                             .getColumnIndexOrThrow("QTYPE")));
+                    /*sb.setREMARK_ALLOW(cursordata.getString(cursordata
+                            .getColumnIndexOrThrow("REMARK_ALLOW")));
+                    sb.setREMARK_LEVEL(cursordata.getString(cursordata
+                            .getColumnIndexOrThrow("REMARK_LEVEL")));*/
 
                     auditData.add(sb);
                     cursordata.moveToNext();
@@ -6081,6 +6087,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setANSWER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER")));
                     sb.setCAMERA_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CAMERA_ALLOW")));
                     sb.setNO_OF_CAMERA(dbcursor.getString(dbcursor.getColumnIndexOrThrow("NO_OF_CAMERA")));
+                    sb.setREMARK_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_ALLOW")));
+                    sb.setREMARK_LEVEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LEVEL")));
 
                     list.add(sb);
                     dbcursor.moveToNext();
@@ -6118,6 +6126,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("ANS_CAM_IMAGE", data.getCAM_IMAGE());
                 values.put("ANS_CAM_IMAGE2", data.getCAM_IMAGE2());
                 values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW());
+                values.put("REMARK_ALLOW", data.getREMARK_ALLOW());
+                values.put("REMARK_LEVEL", data.getREMARK_LEVEL());
+                values.put("REMARK", data.getTXT_REMARK());
 
                 db.insert(CommonString.TABLE_AUDIT_DATA_SAVE, null, values);
             }
@@ -6148,6 +6159,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setCAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE")));
                     sb.setCAM_IMAGE2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE2")));
                     sb.setCAMERA_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CAMERA_ALLOW")));
+                    sb.setREMARK_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_ALLOW")));
+                    sb.setREMARK_LEVEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LEVEL")));
+                    sb.setTXT_REMARK(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK")));
 
                     list.add(sb);
                     dbcursor.moveToNext();
@@ -6184,6 +6198,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setCAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE")));
                     sb.setCAM_IMAGE2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANS_CAM_IMAGE2")));
                     sb.setANSWER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ANSWER")));
+                    sb.setTXT_REMARK(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK")));
+
 
                     list.add(sb);
                     dbcursor.moveToNext();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -221,8 +221,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
         //Kenya
        //   museridView.setText("test.Kenya");
-       /* museridView.setText("testkenya");
+       // museridView.setText("testkenya");
-        mPasswordView.setText("cpm123");*/
+       // mPasswordView.setText("cpm123");
 
         /*museridView.setText("rajesh.r");
         mPasswordView.setText("cpm123");*/
@@ -710,69 +710,45 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             ///   myTrace.stop();
 
             if (result.equals(CommonString.KEY_SUCCESS)) {
-
+                // manually set true for South Africa
-                //set true for South Africa
                 boolean forSA = false;
-
 //				database.open();
                 if (forSA) {
                     //For SA Only
                     if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
-
                         Intent intent = new Intent(getBaseContext(), SelectLanguageActivity.class);
                         intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
                         startActivity(intent);
-
                         finish();
                     } else {
-
                         setLanguageDataFromSharedPreferences();
-
                         CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
-
                         Intent in = new Intent(context, MPinActivity.class);
                         in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
                         startActivity(in);
                         finish();
-
-
                         //uploadPreviousImages();
                     }
                 } else {
                     //for other than SA
                     if (preferences.getString(CommonString.KEY_VERSION, "").equals(Integer.toString(versionCode))) {
-
                         if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
-
+                            Intent intent = new Intent(getBaseContext(), SelectLanguageActivity.class);
-                            Intent intent = new Intent(getBaseContext(),
-                                    SelectLanguageActivity.class);
-
                             intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
                             startActivity(intent);
-
                             finish();
                         } else {
-
                             setLanguageDataFromSharedPreferences();
-
                             Intent in = new Intent(context, MPinActivity.class);
                             in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
                             startActivity(in);
                             finish();
-
                             //uploadPreviousImages();
-
                         }
 
-
                     } else {
-
+                        Intent intent = new Intent(getBaseContext(), AutoUpdateActivity.class);
-                        Intent intent = new Intent(getBaseContext(),
+                        intent.putExtra(CommonString.KEY_PATH, preferences.getString(CommonString.KEY_PATH, ""));
-                                AutoUpdateActivity.class);
-
-                        intent.putExtra(CommonString.KEY_PATH,
-                                preferences.getString(CommonString.KEY_PATH, ""));
                         startActivity(intent);
                         finish();
                     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -1048,6 +1048,15 @@ public class CommonString {
             + " INTEGER,"
 
             + "ANSWER_TYPE"
+            + " VARCHAR,"
+
+            + "REMARK_ALLOW"
+            + " INTEGER,"
+
+            + "REMARK_LEVEL"
+            + " VARCHAR,"
+
+            + "REMARK"
             + " VARCHAR"
 
             + ")";

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java

@@ -116,21 +116,6 @@ public class AuditActivity extends AppCompatActivity {
 
             question_list = getAuditQnsRemoved();
 
-           /* question_list = db.getAuditCategoryWise(categoryId, storeType_id);
-
-            Iterator<AuditDataGetterSetter> iterator = question_list.iterator();
-            while (iterator.hasNext()) {
-                AuditDataGetterSetter item = iterator.next(); // must be called before you can call iterator.remove()
-                // Check condition
-                if (!item.getKEYACCOUNT_ID().equals("0") && !item.getKEYACCOUNT_ID().equals(keyAccount_id)) {
-                    iterator.remove();
-                } else if (!item.getCHECK_TYPE().equals("NA") && item.getCHECK_TYPE().equals("T2P")) {
-
-                    if (!db.isMappingT2PData(store_id, categoryId)) {
-                        iterator.remove();
-                    }
-                }
-            }*/
         }
 
         hashMapAnsListChildData = new HashMap<>();
@@ -171,25 +156,6 @@ public class AuditActivity extends AppCompatActivity {
                         db.saveAuditQuestionAnswerData(question_list, store_id, categoryId);
                         finish();
                         overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-                        /*
-                        AlertDialog.Builder builder = new AlertDialog.Builder(AuditActivity.this);
-                        builder.setMessage(R.string.title_activity_Want_save)
-                                .setCancelable(false)
-                                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int id) {
-
-                                        db.saveAuditQuestionAnswerData(question_list, store_id, categoryId);
-                                        finish();
-                                        overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-                                    }
-                                })
-                                .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int id) {
-                                        dialog.cancel();
-                                    }
-                                });
-                        AlertDialog alert = builder.create();
-                        alert.show();*/
                     } else {
                         questionAdapter.notifyDataSetChanged();
                         Snackbar.make(recyclerView, error_msg, Snackbar.LENGTH_SHORT).show();
@@ -336,8 +302,6 @@ public class AuditActivity extends AppCompatActivity {
     class AnswerAdapter extends RecyclerView.Adapter<AnswerAdapter.ViewHolder> {
         ArrayList<AuditDataGetterSetter> questionList;
         HashMap<AuditDataGetterSetter, ArrayList<AuditDataGetterSetter>> answerHashMap;
-        ArrayList<AuditDataGetterSetter> answerList;
-        // ArrayList<Audit_QuestionDataGetterSetter> ans_list;
 
         public AnswerAdapter(ArrayList<AuditDataGetterSetter> questionList,
                              HashMap<AuditDataGetterSetter, ArrayList<AuditDataGetterSetter>> answerHashMap) {
@@ -374,6 +338,19 @@ public class AuditActivity extends AppCompatActivity {
             else {
                 holder.parent_cam_layout.setVisibility(View.GONE);
             }
+            //text
+            if (holder.data.getREMARK_ALLOW().equals("1")) {
+                holder.edt_text.setVisibility(View.VISIBLE);
+                holder.txt_leval.setVisibility(View.VISIBLE);
+                holder.txt_leval.setText(holder.data.getREMARK_LEVEL());
+
+            }
+            else {
+                holder.edt_text.setVisibility(View.GONE);
+                holder.txt_leval.setVisibility(View.GONE);
+            }
+
+
 
             holder.sp_auditAnswer.setAdapter(new AnswerSpinnerAdapter(AuditActivity.this, R.layout.custom_spinner_item, ans_list));
 
@@ -385,6 +362,20 @@ public class AuditActivity extends AppCompatActivity {
                     holder.data.setANSWER_ID(ans.getANSWER_ID());
                     holder.data.setANSWER(ans.getANSWER());
                     holder.data.setCAMERA_ALLOW(ans.getCAMERA_ALLOW());
+                    holder.data.setREMARK_ALLOW(ans.getREMARK_ALLOW());
+                    holder.data.setREMARK_LEVEL(ans.getREMARK_LEVEL());
+
+                    //text
+                    if (holder.data.getREMARK_ALLOW().equals("1")) {
+                        holder.edt_text.setVisibility(View.VISIBLE);
+                        holder.txt_leval.setVisibility(View.VISIBLE);
+                        holder.txt_leval.setText(holder.data.getREMARK_LEVEL());
+                    }else {
+                        holder.edt_text.setVisibility(View.GONE);
+                        holder.txt_leval.setVisibility(View.GONE);
+                        holder.data.setTXT_REMARK("");
+                    }
+
                     if (holder.data.getCAMERA_ALLOW().equals("1")) {
                         holder.parent_cam_layout.setVisibility(View.VISIBLE);
                         if (ans.getNO_OF_CAMERA().equals("2")) {
@@ -451,6 +442,17 @@ public class AuditActivity extends AppCompatActivity {
                 }
             });
 
+            //set remark
+            holder.edt_text.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    if (!hasFocus) {
+                       // holder.data.setANSWER_ID("0");
+                        holder.data.setTXT_REMARK(((EditText) v).getText().toString().replaceAll("[&^<>{}'$]", ""));
+                    }
+                }
+            });
+
             for (int i = 0; i < ans_list.size(); i++) {
                 if (holder.data.getANSWER_TYPE().equalsIgnoreCase("Dropdown") && ans_list.get(i).getANSWER_ID().equals(holder.data.getANSWER_ID())) {
                     holder.sp_auditAnswer.setSelection(i);
@@ -461,6 +463,11 @@ public class AuditActivity extends AppCompatActivity {
             if(holder.data.getANSWER_TYPE().equalsIgnoreCase("TEXTBOX")){
                 holder.edt_answer.setText(holder.data.getANSWER());
             }
+            //set text
+
+            if(holder.data.getREMARK_ALLOW().equalsIgnoreCase("1")){
+                holder.edt_text.setText(holder.data.getTXT_REMARK());
+            }
 
             if (!img_str.equals("")) {
                 if (child_position == position) {
@@ -469,6 +476,7 @@ public class AuditActivity extends AppCompatActivity {
                     child_position = -1;
                 }
             }
+
             if (!img_str2.equals("")) {
                 if (child_position == position) {
                     holder.data.setCAM_IMAGE2(img_str2);
@@ -506,9 +514,9 @@ public class AuditActivity extends AppCompatActivity {
 
         public class ViewHolder extends RecyclerView.ViewHolder {
             public final View mView;
-            public final TextView txt_question;
+            public final TextView txt_question,txt_leval;
             public final Spinner sp_auditAnswer;
-            public final EditText edt_answer;
+            public final EditText edt_answer,edt_text;
             public final ImageView img_cam, img_cam2;
             public final RelativeLayout parent_cam_layout;
             CardView card_view;
@@ -518,9 +526,11 @@ public class AuditActivity extends AppCompatActivity {
                 super(view);
                 mView = view;
 
+                txt_leval = (TextView) view.findViewById(R.id.txt_leval);
                 txt_question = (TextView) view.findViewById(R.id.txt_question);
                 sp_auditAnswer = (Spinner) view.findViewById(R.id.sp_auditAnswer);
                 card_view = (CardView) view.findViewById(R.id.card_view);
+                edt_text = (EditText) view.findViewById(R.id.edt_text);
                 edt_answer = (EditText) view.findViewById(R.id.edt_answer);
                 img_cam = (ImageView) view.findViewById(R.id.img_cam);
                 img_cam2 = (ImageView) view.findViewById(R.id.img_cam2);
@@ -581,13 +591,16 @@ public class AuditActivity extends AppCompatActivity {
             }else if (data.get(i).getANSWER_TYPE().equalsIgnoreCase("DROPDOWN") && data.get(i).getANSWER_ID().equalsIgnoreCase("0")) {
                 error_msg = getString(R.string.pls_answer_all_qns);
                 checkflag = false;
-
             } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getCAM_IMAGE().equals("")) {
                 error_msg = getString(R.string.click_image);
                 checkflag = false;
             } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getNO_OF_CAMERA().equals("2") && data.get(i).getCAM_IMAGE2().equals("")) {
                 error_msg = getString(R.string.click_image);
                 checkflag = false;
+                //text
+            } else if (data.get(i).getREMARK_ALLOW().equals("1")  && data.get(i).getTXT_REMARK().equals("")) {
+                error_msg = getString(R.string.pleaseenterRemarks);
+                checkflag = false;
             }else {
                 checkflag = true;
             }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java

@@ -1287,6 +1287,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                                 + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
                                                 + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
                                                 + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
+                                                + "[REMARK]" + audit_data.get(n).getTXT_REMARK() + "[/REMARK]"
                                                 + "[/AUDIT_DATA]";
 
                                         Audit_data = Audit_data + onXml_audit_data;
@@ -1296,7 +1297,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
 
                                     request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
                                     request.addProperty("XMLDATA", sos_xml);
-                                    request.addProperty("KEYS", "AUDIT_DATA_LATEST");
+                                    request.addProperty("KEYS", "AUDIT_DATA_NEW");
                                     request.addProperty("USERNAME", userId);
                                     request.addProperty("MID", mid);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -1519,6 +1519,7 @@ public class UploadActivity extends AppCompatActivity {
                                                 + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
                                                 + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
                                                 + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
+                                                + "[REMARK]" + audit_data.get(n).getTXT_REMARK() + "[/REMARK]"
                                                 + "[/AUDIT_DATA]";
 
                                         Audit_data = Audit_data + onXml_audit_data;
@@ -1528,7 +1529,7 @@ public class UploadActivity extends AppCompatActivity {
 
                                     request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
                                     request.addProperty("XMLDATA", sos_xml);
-                                    request.addProperty("KEYS", "AUDIT_DATA_LATEST");
+                                    request.addProperty("KEYS", "AUDIT_DATA_NEW");
                                     request.addProperty("USERNAME", userId);
                                     request.addProperty("MID", mid);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java

@@ -335,6 +335,7 @@ public class UploadImageWithRetrofit {
    }
 
 
+
 /*
    public File saveBitmapToFileSmaller(File file) {
        File file2 = file;
@@ -385,6 +386,7 @@ public class UploadImageWithRetrofit {
 
 
 
+
     public void showAlert(final Context context, String str, final boolean flag) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(context);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AdditionalQuestiongetterSetter.java

@@ -23,6 +23,25 @@ public class AdditionalQuestiongetterSetter {
     ArrayList<String> NO_OF_CAMERA = new ArrayList<>();
     ArrayList<String> TYPE = new ArrayList<>();
 
+    public ArrayList<String> getREMARK_ALLOW() {
+        return REMARK_ALLOW;
+    }
+
+    public void setREMARK_ALLOW(String REMARK_ALLOW) {
+        this.REMARK_ALLOW.add(REMARK_ALLOW);
+    }
+
+    public ArrayList<String> getREMARK_LEVEL() {
+        return REMARK_LEVEL;
+    }
+
+    public void setREMARK_LEVEL(String REMARK_LEVEL) {
+        this.REMARK_LEVEL.add(REMARK_LEVEL);
+    }
+
+    ArrayList<String> REMARK_ALLOW = new ArrayList<>();
+    ArrayList<String> REMARK_LEVEL = new ArrayList<>();
+
     public String getTable_ADDITIONAL_QUESTION() {
         return table_ADDITIONAL_QUESTION;
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/AuditDataGetterSetter.java

@@ -6,7 +6,48 @@ package cpm.com.gskmtorange.xmlGetterSetter;
 
 public class AuditDataGetterSetter {
 
-    String QUESTION_ID, CULTURE_ID, CATEGORY_ID, QUESTION, ANSWER_TYPE, ANSWER_ID = "0", ANSWER="", CAM_IMAGE="", CAMERA_ALLOW="0", KEYACCOUNT_ID="0", NO_OF_CAMERA ="1", CAM_IMAGE2="", CHECK_TYPE;
+    String QUESTION_ID;
+    String CULTURE_ID;
+    String CATEGORY_ID;
+    String QUESTION;
+    String ANSWER_TYPE;
+    String ANSWER_ID = "0";
+    String ANSWER="";
+    String CAM_IMAGE="";
+
+    public String getTXT_REMARK() {
+        return TXT_REMARK;
+    }
+
+    public void setTXT_REMARK(String TXT_REMARK) {
+        this.TXT_REMARK = TXT_REMARK;
+    }
+
+    String TXT_REMARK="";
+    String CAMERA_ALLOW="0";
+    String KEYACCOUNT_ID="0";
+    String NO_OF_CAMERA ="1";
+    String CAM_IMAGE2="";
+    String CHECK_TYPE;
+
+    public String getREMARK_ALLOW() {
+        return REMARK_ALLOW;
+    }
+
+    public void setREMARK_ALLOW(String REMARK_ALLOW) {
+        this.REMARK_ALLOW = REMARK_ALLOW;
+    }
+
+    public String getREMARK_LEVEL() {
+        return REMARK_LEVEL;
+    }
+
+    public void setREMARK_LEVEL(String REMARK_LEVEL) {
+        this.REMARK_LEVEL = REMARK_LEVEL;
+    }
+
+    String REMARK_ALLOW="0";;
+    String REMARK_LEVEL="";
 
 
     public String getQUESTION_ID() {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -1117,6 +1117,12 @@ public class XMLHandlers {
                     if (xpp.getName().equals("QTYPE")) {
                         st.setTYPE(xpp.nextText());
                     }
+                    if (xpp.getName().equals("REMARK_ALLOW")) {
+                        st.setREMARK_ALLOW(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("REMARK_LEVEL")) {
+                        st.setREMARK_LEVEL(xpp.nextText());
+                    }
                 }
                 xpp.next();
             }

GSKMTOrange/src/main/res/layout/audit_question_list_item.xml

@@ -59,11 +59,30 @@
                     android:focusable="true"
                     android:visibility="gone"
                     android:inputType="number"
-                    android:maxLength="5"
+                    android:maxLength="5" />
-                    />
+
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/txt_leval"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="20dp"
+                android:paddingTop="5dp"
+                android:visibility="visible"
+                android:textColor="@color/black"
+                android:textSize="16dip" />
+
+            <EditText
+                android:id="@+id/edt_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:visibility="visible" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"