|
|
@@ -210,7 +210,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
saveTask(id);
|
|
|
break;
|
|
|
case Constants.APP_SOCKETIMEOUTEXCEPTION:
|
|
|
- ViewUtil.ToastMessage(ct,msg.getData().getString("result"));
|
|
|
+ ViewUtil.ToastMessage(ct, msg.getData().getString("result"));
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
@@ -231,8 +231,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
}
|
|
|
|
|
|
/* (non-Javadoc)
|
|
|
- * @see com.erp.base.BaseAcivity#initView()
|
|
|
- */
|
|
|
+ * @see com.erp.base.BaseAcivity#initView()
|
|
|
+ */
|
|
|
public void initView() {
|
|
|
setContentView(R.layout.act_task_add);
|
|
|
ViewUtils.inject(this);
|
|
|
@@ -268,7 +268,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
@Override
|
|
|
public void onDatePicked(String date) {
|
|
|
// Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
|
|
|
- et_task_startime.setText(date+":00:00");
|
|
|
+ et_task_startime.setText(date + ":00:00");
|
|
|
dialog.dismiss();
|
|
|
}
|
|
|
});
|
|
|
@@ -276,7 +276,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
@Override
|
|
|
public void onDatePicked(String date) {
|
|
|
// Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
|
|
|
- et_task_startime.setText(date+":00:00");
|
|
|
+ et_task_startime.setText(date + ":00:00");
|
|
|
dialog.dismiss();
|
|
|
}
|
|
|
});
|
|
|
@@ -304,7 +304,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
break;
|
|
|
case R.id.bt_task_add:
|
|
|
if (!StringUtils.isEmpty(et_task_startime.getText().toString())
|
|
|
- && et_task_people.getTags().length>0
|
|
|
+ && et_task_people.getTags().length > 0
|
|
|
&& !StringUtils.isEmpty(et_task_remark.getText().toString())) {
|
|
|
boolean falg = ViewUtil.isCheckDateTime(
|
|
|
CommonUtil.getStringDate(System.currentTimeMillis()),
|
|
|
@@ -486,15 +486,13 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
int type = cb_task_reply.isChecked() == true ? 1 : 0;
|
|
|
String name = "来自" + CommonUtil.getSharedPreferences(ct, "erp_username") + "的任务";
|
|
|
String formStore;
|
|
|
- String[] people= et_task_people.getTags();
|
|
|
- String resourcename="";
|
|
|
- for (int i=0;i<people.length;i++)
|
|
|
- {
|
|
|
- if (i==people.length-1){
|
|
|
- resourcename=resourcename+people[i].trim();
|
|
|
- }
|
|
|
- else{
|
|
|
- resourcename=resourcename+people[i].trim()+",";
|
|
|
+ String[] people = et_task_people.getTags();
|
|
|
+ String resourcename = "";
|
|
|
+ for (int i = 0; i < people.length; i++) {
|
|
|
+ if (i == people.length - 1) {
|
|
|
+ resourcename = resourcename + people[i].trim();
|
|
|
+ } else {
|
|
|
+ resourcename = resourcename + people[i].trim() + ",";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -503,7 +501,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
formStore = "{'name':'" + name + "'"
|
|
|
+ ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
|
|
|
+ "'enddate':'" + et_task_startime.getText().toString() + "',"
|
|
|
- + "'type':'" + type + "','resourcename':'" +resourcename + "',"
|
|
|
+ + "'type':'" + type + "','resourcename':'" + resourcename + "',"
|
|
|
+ "'description':'" + et_task_remark.getText().toString() + "'"
|
|
|
+ "}";
|
|
|
} else {
|
|
|
@@ -511,7 +509,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
formStore = "{'name':'" + name + "'"
|
|
|
+ ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
|
|
|
+ "'enddate':'" + et_task_startime.getText().toString() + "',"
|
|
|
- + "'type':'" + type + "','resourcename':'" +resourcename + "',"
|
|
|
+ + "'type':'" + type + "','resourcename':'" + resourcename + "',"
|
|
|
+ "'description':'" + et_task_remark.getText().toString() + "',"
|
|
|
+ "'attachs':'" + id + "'"
|
|
|
+ "}";
|
|
|
@@ -762,7 +760,6 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
switch (requestCode) {
|
|
|
@@ -776,8 +773,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
|
|
|
}
|
|
|
if (resultCode == 1) {
|
|
|
String values = data.getStringExtra("employees");
|
|
|
- Log.i("fromStore",values);
|
|
|
- String[] tag_values=values.split(",");
|
|
|
+ Log.i("fromStore", values);
|
|
|
+ String[] tag_values = values.split(",");
|
|
|
et_task_people.setTags(tag_values);
|
|
|
}
|
|
|
break;
|