mirror of https://github.com/tasks/tasks
added some missing new files
Arne Jans
16 years ago
parent
a9130b3ba4
commit
01ff80a369
@ -0,0 +1,157 @@
|
|||||||
|
package com.todoroo.astrid.producteev;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.AdapterView;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
|
import android.widget.Spinner;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.AdapterView.OnItemSelectedListener;
|
||||||
|
|
||||||
|
import com.timsu.astrid.R;
|
||||||
|
import com.todoroo.andlib.service.Autowired;
|
||||||
|
import com.todoroo.andlib.service.DependencyInjectionService;
|
||||||
|
import com.todoroo.andlib.service.ExceptionService;
|
||||||
|
import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
|
||||||
|
import com.todoroo.astrid.model.Metadata;
|
||||||
|
import com.todoroo.astrid.model.StoreObject;
|
||||||
|
import com.todoroo.astrid.model.Task;
|
||||||
|
import com.todoroo.astrid.producteev.sync.ProducteevDashboard;
|
||||||
|
import com.todoroo.astrid.producteev.sync.ProducteevDataService;
|
||||||
|
import com.todoroo.astrid.producteev.sync.ProducteevTask;
|
||||||
|
import com.todoroo.astrid.producteev.sync.ProducteevUser;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Control Set for managing task/dashboard assignments in Producteev
|
||||||
|
*
|
||||||
|
* @author Arne Jans <arne.jans@gmail.com>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class ProducteevControlSet implements TaskEditControlSet {
|
||||||
|
|
||||||
|
// --- instance variables
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ExceptionService exceptionService;
|
||||||
|
|
||||||
|
private Activity activity;
|
||||||
|
|
||||||
|
private Task myTask;
|
||||||
|
private Spinner responsibleSelector;
|
||||||
|
private Spinner dashboardSelector;
|
||||||
|
|
||||||
|
private ArrayList<ProducteevUser> users = null;
|
||||||
|
private ArrayList<ProducteevDashboard> dashboards = null;
|
||||||
|
|
||||||
|
public ProducteevControlSet(final Activity activity, ViewGroup parent) {
|
||||||
|
DependencyInjectionService.getInstance().inject(this);
|
||||||
|
|
||||||
|
this.activity = activity;
|
||||||
|
LayoutInflater.from(activity).inflate(R.layout.producteev_control, parent, true);
|
||||||
|
|
||||||
|
this.responsibleSelector = (Spinner) activity.findViewById(R.id.producteev_TEA_task_assign);
|
||||||
|
this.responsibleSelector.setOnItemSelectedListener(new OnItemSelectedListener() {
|
||||||
|
@Override
|
||||||
|
public void onItemSelected(AdapterView<?> parent, View view,
|
||||||
|
int position, long id) {
|
||||||
|
// TODO tim, please set a flag here somewhere, so that producteevinvoker knows
|
||||||
|
// it has to invoke tasks/set_responsible, or otherwise do it your way...
|
||||||
|
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onNothingSelected(AdapterView<?> parent) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.dashboardSelector = (Spinner) activity.findViewById(R.id.producteev_TEA_dashboard_assign);
|
||||||
|
this.dashboardSelector.setOnItemSelectedListener(new OnItemSelectedListener() {
|
||||||
|
@Override
|
||||||
|
public void onItemSelected(AdapterView<?> parent, View view,
|
||||||
|
int position, long id) {
|
||||||
|
// TODO tim, please set a flag here somewhere, so that producteevinvoker knows
|
||||||
|
// it has to invoke tasks/set_dashboard, or otherwise do it your way...
|
||||||
|
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onNothingSelected(AdapterView<?> parent) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void readFromTask(Task task) {
|
||||||
|
this.myTask = task;
|
||||||
|
Metadata metadata = ProducteevDataService.getInstance().getTaskMetadata(myTask.getId());
|
||||||
|
if (metadata != null) {
|
||||||
|
// Fill the dashboard-spinner and set the current dashboard
|
||||||
|
long dashboardId = metadata.getValue(ProducteevTask.DASHBOARD_ID);
|
||||||
|
|
||||||
|
StoreObject[] dashboardsData = ProducteevDataService.getInstance().getDashboards();
|
||||||
|
dashboards = new ArrayList(dashboardsData.length);
|
||||||
|
ProducteevDashboard ownerDashboard = null;
|
||||||
|
int dashboardSpinnerIndex = 0;
|
||||||
|
//dashboard to not sync as first spinner-entry
|
||||||
|
dashboards.add(new ProducteevDashboard(ProducteevUtilities.DASHBOARD_NO_SYNC, activity.getString(R.string.producteev_no_dashboard),null));
|
||||||
|
for (int i=1;i<dashboardsData.length+1;i++) {
|
||||||
|
ProducteevDashboard dashboard = new ProducteevDashboard(dashboardsData[i]);
|
||||||
|
dashboards.add(dashboard);
|
||||||
|
if(dashboard.getId() == dashboardId) {
|
||||||
|
ownerDashboard = dashboard;
|
||||||
|
dashboardSpinnerIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ArrayAdapter<String> dashAdapter = new ArrayAdapter(activity,
|
||||||
|
android.R.layout.simple_spinner_item, dashboards);
|
||||||
|
dashAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||||
|
dashboardSelector.setAdapter(dashAdapter);
|
||||||
|
dashboardSelector.setSelection(dashboardSpinnerIndex);
|
||||||
|
|
||||||
|
if (ownerDashboard == null || ownerDashboard.getId() == ProducteevUtilities.DASHBOARD_NO_SYNC) {
|
||||||
|
responsibleSelector.setEnabled(false);
|
||||||
|
TextView emptyView = new TextView(activity);
|
||||||
|
emptyView.setText(activity.getText(R.string.producteev_no_dashboard));
|
||||||
|
responsibleSelector.setEmptyView(emptyView);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
responsibleSelector.setEnabled(true);
|
||||||
|
// Fill the responsible-spinner and set the current responsible
|
||||||
|
users = ownerDashboard.getUsers();
|
||||||
|
long responsibleId = metadata.getValue(ProducteevTask.RESPONSIBLE_ID);
|
||||||
|
int userSpinnerIndex = 0;
|
||||||
|
|
||||||
|
for (ProducteevUser user : users) {
|
||||||
|
if (user.getId() == responsibleId) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
userSpinnerIndex++;
|
||||||
|
}
|
||||||
|
ArrayAdapter<String> usersAdapter = new ArrayAdapter(activity,
|
||||||
|
android.R.layout.simple_spinner_item, users);
|
||||||
|
responsibleSelector.setAdapter(usersAdapter);
|
||||||
|
responsibleSelector.setSelection(userSpinnerIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("nls")
|
||||||
|
@Override
|
||||||
|
public void writeToModel(Task task) {
|
||||||
|
Metadata metadata = ProducteevDataService.getInstance().getTaskMetadata(task.getId());
|
||||||
|
if (metadata != null) {
|
||||||
|
ProducteevDashboard dashboard = (ProducteevDashboard) dashboardSelector.getSelectedItem();
|
||||||
|
metadata.setValue(ProducteevTask.DASHBOARD_ID, dashboard.getId());
|
||||||
|
|
||||||
|
ProducteevUser responsibleUser = (ProducteevUser) responsibleSelector.getSelectedItem();
|
||||||
|
metadata.setValue(ProducteevTask.RESPONSIBLE_ID, responsibleUser.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,84 @@
|
|||||||
|
package com.todoroo.astrid.producteev.sync;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Arne Jans <arne.jans@gmail.com>
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("nls")
|
||||||
|
public class ProducteevUser {
|
||||||
|
|
||||||
|
private final long id;
|
||||||
|
|
||||||
|
private final String email;
|
||||||
|
|
||||||
|
private final String firstname;
|
||||||
|
|
||||||
|
private final String lastname;
|
||||||
|
|
||||||
|
public ProducteevUser(long id, String email, String firstname, String lastname) {
|
||||||
|
this.id = id;
|
||||||
|
this.email = email;
|
||||||
|
this.firstname = firstname;
|
||||||
|
this.lastname = lastname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProducteevUser(JSONObject elt) throws JSONException {
|
||||||
|
this.id = elt.getLong("id");
|
||||||
|
this.email = elt.getString("email");
|
||||||
|
this.firstname = elt.getString("firstname");
|
||||||
|
this.lastname = elt.getString("lastname");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the email
|
||||||
|
*/
|
||||||
|
public String getEmail() {
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the firstname
|
||||||
|
*/
|
||||||
|
public String getFirstname() {
|
||||||
|
return firstname;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the lastname
|
||||||
|
*/
|
||||||
|
public String getLastname() {
|
||||||
|
return lastname;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the id
|
||||||
|
*/
|
||||||
|
public long getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
String displayString = null;
|
||||||
|
boolean hasFirstname = false;
|
||||||
|
boolean hasLastname = false;
|
||||||
|
if (firstname != null && firstname.length() > 0) {
|
||||||
|
displayString += firstname;
|
||||||
|
hasFirstname = true;
|
||||||
|
}
|
||||||
|
if (lastname != null && lastname.length() > 0)
|
||||||
|
hasLastname = true;
|
||||||
|
if (hasFirstname && hasLastname)
|
||||||
|
displayString += " ";
|
||||||
|
if (hasLastname)
|
||||||
|
displayString += lastname;
|
||||||
|
|
||||||
|
if (!hasFirstname && !hasLastname && email != null && email.length() > 0)
|
||||||
|
displayString += email;
|
||||||
|
return displayString;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- See the file "LICENSE" for the full license governing this code. -->
|
||||||
|
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<!-- producteev task assignment controlset -->
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/producteev_TEA_task_assign_label"
|
||||||
|
style="@style/TextAppearance.GEN_EditLabel" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/producteev_TEA_task_assign"
|
||||||
|
android:prompt="@string/producteev_TEA_task_assign_label"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/producteev_TEA_dashboard_assign_label"
|
||||||
|
style="@style/TextAppearance.GEN_EditLabel" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/producteev_TEA_dashboard_assign"
|
||||||
|
android:prompt="@string/producteev_TEA_dashboard_assign_label"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="1dip"
|
||||||
|
android:padding="5dip"
|
||||||
|
android:background="@android:drawable/divider_horizontal_dark" />
|
||||||
|
|
||||||
|
</merge>
|
||||||
|
|
||||||
Loading…
Reference in New Issue