修改拜访报告单

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -114,7 +114,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private boolean isMe = true;
     /*
      *单据状态和显示按钮的对应：
-     * 0.无状态==》提交==》saveVisitRecord.action
+     * 0.无状态==》提交==》saveVisitRecord.action=>submitVisitRecord
      * 1.在录入||反提交后(在录入)==》删除&&更新==》deleteVisitRecord.action||updateVisitRecord.action
      * 2.已提交==》反提交==》resSubmitVisitRecord.action
      * 3.已审核==》所有的按钮没有了

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -21,6 +21,7 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
@@ -222,8 +223,6 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
      */
     private void handlerWorkLog(JSONObject object, final ArrayList<WorkModel> logModels) throws Exception {
         ArrayList<WorkModel> models = WorkHandlerUtil.handlerWorkLog(object, logModels);
-
-
         setDate2Adapter(models);
     }
 
@@ -312,8 +311,14 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
 
     class WorkAdapter extends BaseAdapter {
         private List<WorkModel> models;
+        private boolean isBeforeTaday;
+        private boolean isTaday;
 
         public void setModels(List<WorkModel> models) {
+            isBeforeTaday = selectDate.before(new Date());
+            isTaday = selectDate.equals(new Date());
+            LogUtil.i("isAfterTaday=" + isBeforeTaday);
+            LogUtil.i("isTaday=" + isTaday);
             this.models = models;
         }
 
@@ -355,12 +360,14 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
         private void initItemView(ViewHoder hoder, int position) {
             WorkModel model = models.get(position);
             hoder.title_tv.setText(getString(R.string.sign_flights) + (position + 1) + " " + model.getWorkTime() + "-" + model.getOffTime());
-            hoder.work_tv.setText(StringUtils.isEmpty(model.getWorkSignin()) ? "" : model.getWorkSignin());
-            hoder.off_tv.setText(StringUtils.isEmpty(model.getOffSignin()) ? "" : model.getOffSignin());
+            hoder.work_tv.setText(StringUtils.isEmpty(model.getWorkSignin()) ? (isBeforeTaday ? getString(R.string.no_) : "") : model.getWorkSignin());
+            hoder.off_tv.setText(StringUtils.isEmpty(model.getOffSignin()) ? (isBeforeTaday ? getString(R.string.no_) : "") : model.getOffSignin());
             String workTag = "";
+
+
             if (StringUtils.isEmpty(model.getWorkSignin())) {
-                if (newHHmm.compareTo(model.getWorkend()) > 0)
-                    workTag = getString(R.string.sign_Absenteeism);
+                if (isBeforeTaday || (isTaday && newHHmm.compareTo(model.getWorkend()) > 0))
+                    workTag = getString(R.string.missing_card);
             } else {
                 if (model.getWorkSignin().compareTo(model.getWorkTime()) > 0 && model.getWorkSignin().compareTo(model.getWorkend()) <= 0)
                     workTag = getLastTime(model.getWorkSignin(), model.getWorkTime(), true);
@@ -371,6 +378,9 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
             if (!StringUtils.isEmpty(model.getOffSignin())) {
                 if (model.getOffSignin().compareTo(model.getOffStart()) > 0 && model.getOffSignin().compareTo(model.getOffTime()) < 0)
                     offTag = getLastTime(model.getOffSignin(), model.getOffTime(), false);
+            } else {
+                if (isBeforeTaday || (isTaday && newHHmm.compareTo(model.getWorkend()) > 0))
+                    offTag = getString(R.string.missing_card);
             }
             hoder.off_tag_tv.setText(offTag);
         }

WeiChat/src/main/res/drawable/attendance_dl.xml

@@ -3,6 +3,7 @@
     <item>
         <shape>
             <solid android:color="#afb9ff" />
+
             <corners android:radius="360dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>

WeiChat/src/main/res/layout/activity_visit_report_add.xml

@@ -170,7 +170,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="35dp"
+                android:layout_marginLeft="50dp"
                 android:layout_toRightOf="@+id/phone_tag"
                 android:text="*"
                 android:textColor="@color/red" />

WeiChat/src/main/res/layout/include_attendance_show.xml

@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendances_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendances_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendances_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -56,13 +56,12 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendances_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
     </LinearLayout>
 
-
     <View
         android:layout_width="match_parent"
         android:layout_height="2px"
@@ -76,11 +75,12 @@
 
         <TextView
             android:id="@+id/l3"
+
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -91,7 +91,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -109,7 +109,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -120,7 +120,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -138,7 +138,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -149,7 +149,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -167,7 +167,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -178,7 +178,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_weight="1"
-            android:drawableLeft="@drawable/attendance_dl"
+            android:drawableLeft="@drawable/attendance_bg"
             android:drawablePadding="10dp"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />

WeiChat/src/main/res/layout/item_attendance.xml

@@ -47,6 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
+            android:textColor="@color/darkorange"
             android:layout_toRightOf="@id/work_tv"
             android:text="09:20" />
 
@@ -63,6 +64,7 @@
             android:id="@+id/off_tag_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/darkorange"
             android:layout_alignTop="@id/off_tv"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/off_tv"

WeiChat/src/main/res/values-en/strings.xml

@@ -1367,6 +1367,8 @@
         <item>禁言半个月</item>
         <item>禁言一个月</item>
     </string-array>
+    <string name="missing_card">缺卡</string>
+    <string name="before_work">上班前</string>
     <string name="common_list_empty">No data</string>
     <string name="info_2dcode">My QR Code</string>
     <string name="scan_2dcode_addme">Scan the QR Code to add me as a friend </string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -786,7 +786,7 @@
         <item>禁言半个月</item>
         <item>禁言一个月</item>
     </string-array>
-
+    <string name="missing_card">缺卡</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -758,6 +758,8 @@
         <item>禁言半個月</item>
         <item>禁言一個月</item>
     </string-array>
+    <string name="missing_card">缺卡</string>
+    <string name="before_work">上班前</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

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

@@ -1716,4 +1716,6 @@
         <item>禁言半个月</item>
         <item>禁言一个月</item>
     </string-array>
+    <string name="missing_card">缺卡</string>
+    <string name="before_work">上班前</string>
 </resources>