add pending fields in register form

g3ortega · Apr 18, 2015 · 9058fdf · 9058fdf
1 parent 7d48b32
commit 9058fdf
Show file tree

Hide file tree

Showing 11 changed files with 227 additions and 135 deletions.
diff --git a/scanforest/app/app.iml b/scanforest/app/app.iml
@@ -92,6 +92,7 @@
     <orderEntry type="library" exported="" name="play-services-safetynet-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="okio-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="play-services-appindexing-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />

diff --git a/scanforest/app/build.gradle b/scanforest/app/build.gradle
@@ -30,4 +30,5 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:22.0.0'
     compile 'com.android.support:cardview-v7:22.0.0'
     compile 'com.android.support:support-v4:22.0.0'
+    compile 'com.squareup.picasso:picasso:2.5.2'
 }
diff --git a/scanforest/app/src/main/AndroidManifest.xml b/scanforest/app/src/main/AndroidManifest.xml
@@ -55,10 +55,6 @@
             android:name=".vh.CameraActivity"
             android:label="@string/title_activity_camera" >
         </activity>
-        <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
-        </activity>
     </application>
 
 </manifest>
diff --git a/scanforest/app/src/main/java/challenge/scanforest/RegisterActivity.java b/scanforest/app/src/main/java/challenge/scanforest/RegisterActivity.java
@@ -22,14 +22,20 @@
 public class RegisterActivity extends ActionBarActivity implements View.OnClickListener {
 
     Button btnRegister;
-    EditText edUserName;
     EditText etEmail;
     EditText etPassword;
     EditText etConfirmation;
+    EditText etFirstName;
+    EditText etLastName;
+    EditText etCellphone;
+
+
     Spinner spinner;
     ArrayAdapter<CharSequence> adapter;
 
 
+
+
     ApiManager api;
 
     @Override
@@ -49,10 +55,12 @@ private void init() {
         spinner.setAdapter(adapter);
         btnRegister = (Button)findViewById(R.id.btn_submit_register);
         btnRegister.setOnClickListener(this);
-        edUserName = (EditText)findViewById(R.id.et_userName);
+        etFirstName =(EditText)findViewById(R.id.et_first_name);
+        etLastName =(EditText)findViewById(R.id.et_last_Name);
         etEmail = (EditText)findViewById(R.id.et_email);
         etPassword= (EditText)findViewById(R.id.et_password);
         etConfirmation = (EditText)findViewById(R.id.et_confirm_password);
+        etCellphone =(EditText)findViewById(R.id.et_cellphone);
     }
 
 
@@ -105,11 +113,13 @@ private boolean isUserValid(User user) {
 
     public RegisterUser getUser() {
         RegisterUser user =new RegisterUser();
-        user.setmUserName(edUserName.getText().toString());
-        //user.setmEmail(etEmail.getText().toString());
+        user.setFirstName(etFirstName.getText().toString());
+        user.setLastName(etLastName.getText().toString());
+        user.setmUserName(etEmail.getText().toString());
         user.setmPassword(etPassword.getText().toString());
         user.setmPasswordConfirmation(etConfirmation.getText().toString());
         user.setmType(adapter.getItem(spinner.getSelectedItemPosition()).toString());
+        user.setCelphone(etCellphone.getText().toString());
         return  user;
     }
 }
diff --git a/scanforest/app/src/main/java/challenge/scanforest/ReportIncident.java b/scanforest/app/src/main/java/challenge/scanforest/ReportIncident.java
@@ -24,6 +24,8 @@
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.squareup.picasso.Picasso;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -158,7 +160,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
                     bitmap = BitmapFactory.decodeFile(file.getAbsolutePath(),
                             bitmapOptions);
-                    viewImage.setImageBitmap(bitmap);
+                    //viewImage.setImageBitmap(bitmap);
+                    Picasso.with(getApplicationContext()).load(photo).into(viewImage);
                     photo=file;
 
                 } catch (Exception e) {
@@ -176,7 +179,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 photo=new File(picturePath);
                 Bitmap thumbnail = (BitmapFactory.decodeFile(picturePath));
                 Log.w("Path", "" + picturePath + "");
-                viewImage.setImageBitmap(thumbnail);
+                Picasso.with(getApplicationContext())
+                        .load(photo)
+                        .into(viewImage);
             }
         }
     }
@@ -198,7 +203,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 ApiManager.alertService().SendAlert(alert, new OnObjectSaved<Alert>() {
                     @Override
                     public void onSuccess(Alert alert) {
-                        TypedFile alertImage = new TypedFile("application/octet-stream", photo);
+                        TypedFile alertImage = new TypedFile("multipart/form-data", photo);
                         ApiManager.alertService().SendImage(alertImage, alert.getId(), new OnObjectSaved<AlertImage>() {
                             @Override
                             public void onSuccess(AlertImage object) {

diff --git a/scanforest/app/src/main/java/challenge/scanforest/api/AlertService.java b/scanforest/app/src/main/java/challenge/scanforest/api/AlertService.java
@@ -44,7 +44,11 @@ public void failure(RetrofitError error) {
     }
 
     public void SendImage(final TypedFile image, final Integer id, final OnObjectSaved<AlertImage> onImageSave){
-        resource.UploadImage(image, id ,new Callback<AlertImage>() {
+
+        RestAdapter.Builder localBuilder = ApiManager.getImageBuilder();
+        IncidentsResource localResouce=localBuilder.build().create(IncidentsResource.class);
+
+        localResouce.UploadImage(image, id ,new Callback<AlertImage>() {
             @Override
             public void success(AlertImage alertImage, Response response) {
                 onImageSave.onSuccess(alertImage);

diff --git a/scanforest/app/src/main/java/challenge/scanforest/api/ApiManager.java b/scanforest/app/src/main/java/challenge/scanforest/api/ApiManager.java
@@ -1,26 +1,37 @@
 package challenge.scanforest.api;
 
+import android.app.DownloadManager;
+
+import java.util.HashMap;
+
 import challenge.scanforest.models.User;
 import challenge.scanforest.utils.Session;
 import retrofit.RequestInterceptor;
 import retrofit.RestAdapter;
 import retrofit.http.GET;
+import retrofit.http.Headers;
 import retrofit.http.Part;
 
 /**
  * Created by gerardo on 4/11/15.
  */
 public class ApiManager {
 
-    public static RestAdapter.Builder getDefaultBuilder(){
 
-        //String url="http://192.168.0.106:3000";
-        String url="http://scanforest.ga";
 
+    public static RestAdapter.Builder getDefaultBuilder(){
         RestAdapter.Builder builder = new RestAdapter.Builder()
                 .setLogLevel(RestAdapter.LogLevel.FULL)
                 .setRequestInterceptor(getDefaultRequestInterceptor())
-                .setEndpoint(url);
+                .setEndpoint(getUrl());
+        return  builder;
+    }
+
+    public static RestAdapter.Builder getImageBuilder(){
+        RestAdapter.Builder builder = new RestAdapter.Builder()
+                .setLogLevel(RestAdapter.LogLevel.FULL)
+                .setRequestInterceptor(getImageRequestInterceptor())
+                .setEndpoint(getUrl());
         return  builder;
     }
 
@@ -39,6 +50,22 @@ public void intercept(RequestFacade request) {
         return requestInterceptor;
     }
 
+    private static RequestInterceptor getImageRequestInterceptor(){
+        RequestInterceptor requestInterceptor = new RequestInterceptor() {
+            @Override
+            public void intercept(RequestFacade request) {
+                request.addHeader("Accept", "application/json");
+                Session session = Session.getInstance();
+                if(!session.getToken().equals("")){
+                    request.addHeader("Authorization","Token token="+session.getToken());
+                }
+            }
+        };
+        return requestInterceptor;
+    }
+
+
+
     private static UserService userService;
     public static UserService userService(){
         if(userService == null){
@@ -54,4 +81,10 @@ public static AlertService alertService(){
         }
         return alertService;
     }
+
+    public static String getUrl() {
+        final String url="http://192.168.0.106:3000";
+        //String url="http://scanforest.ga";
+        return url;
+    }
 }
diff --git a/scanforest/app/src/main/java/challenge/scanforest/api/IncidentsResource.java b/scanforest/app/src/main/java/challenge/scanforest/api/IncidentsResource.java
@@ -11,6 +11,7 @@
 import retrofit.Callback;
 import retrofit.http.Body;
 import retrofit.http.GET;
+import retrofit.http.Headers;
 import retrofit.http.Multipart;
 import retrofit.http.POST;
 import retrofit.http.PUT;
@@ -22,10 +23,9 @@
  * Created by gerardo on 4/12/15.
  */
 public interface IncidentsResource {
-
     @Multipart
-    @PUT("/api/alerts/{alert_id}/images")
-    void UploadImage(@Part("photo") TypedFile photo, @Path("alert_id") Integer alertId, Callback<AlertImage> cb);
+    @POST("/api/alerts/{alert_id}/images")
+    void UploadImage(@Part("alert_image") TypedFile photo, @Path("alert_id") Integer alertId, Callback<AlertImage> cb);
 
     @POST("/api/alerts")
     void SendAlert(@Body Alert alert, Callback<Alert> cb);

diff --git a/scanforest/app/src/main/java/challenge/scanforest/models/RegisterUser.java b/scanforest/app/src/main/java/challenge/scanforest/models/RegisterUser.java
@@ -7,7 +7,7 @@
 public class RegisterUser extends User {
     @SerializedName("password_confirmation")
     private String mPasswordConfirmation;
-    @SerializedName("type")
+    @SerializedName("role")
     private String mType;
     @SerializedName("first_name")
     private String firstName;