Approve Activity

#12
- set firx and serverx from preferences

Author: eurosecom

app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java

@@ -18,6 +18,7 @@
 import android.widget.Toast;
 
 import com.eusecom.attendance.Constants;
+import com.eusecom.attendance.MainActivity;
 import com.eusecom.attendance.NewPostActivity;
 import com.eusecom.attendance.SettingsActivity;
 import com.eusecom.attendance.models.Attendance;
@@ -43,6 +44,8 @@
 import com.eusecom.attendance.models.Post;
 import com.eusecom.attendance.viewholder.ApproveViewHolder;
 import com.google.firebase.database.ValueEventListener;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -81,8 +84,9 @@ public ApproveListFragment() {}
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String githubToken = Constants.GITHUB_API_KEY;
-        _githubService = RfEtestService.createGithubService(githubToken);
+        String githubToken = Constants.ETEST_API_KEY;
+        String urlx = SettingsActivity.getServerName(getActivity());
+        _githubService = RfEtestService.createGithubService(githubToken, urlx);
 
         _disposables = new CompositeDisposable();
     }
@@ -217,7 +221,7 @@ public boolean onLongClick(View v) {
 
                         abskeydel = absKey;
 
-                        getDialog(abskeydel);
+                        getDialog(abskeydel, model);
 
 
                         return true;
@@ -299,9 +303,21 @@ public String getUid() {
     public abstract Query getQuery(DatabaseReference databaseReference);
 
     // [START deletefan_out]
-    private void approvePost(String postkey, int anodaj) {
+    private void approvePost(String postkey, int anodaj, Attendance model) {
 
-        _disposables.add(_githubService.contributors("square", "retrofit")
+        final String datsx = model.getDatsString();
+        Log.d(TAG, "datsx " + datsx);
+        final String dmxax = model.getDmxa();
+        Log.d(TAG, "dmxax " + dmxax);
+        final String daodx = model.getDaod();
+        Log.d(TAG, "daodx " + daodx);
+
+        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+        String approveabs_json = gson.toJson(model);
+        String savetofir =  SettingsActivity.getFir(getActivity());
+        String whoapprove =  SettingsActivity.getUsOsc(getActivity());
+
+        _disposables.add(_githubService.contributors(savetofir, postkey, whoapprove, approveabs_json)
                 .flatMap(Observable::fromIterable)
                 .flatMap(contributor -> {
                     Observable<RfUser> _userObservable = _githubService.user(contributor.login)
@@ -334,17 +350,18 @@ public void onNext(Pair pair) {
 
                         String snext =  " "  +  user.name + " "
                                 + user.email + " "
-                                + contributor.contributions;
+                                + contributor.contributions + " "
+                                + contributor.memo;
 
                         Log.d(TAG, "onnext " + snext);
-                        Toast.makeText(getActivity(), user.email, Toast.LENGTH_LONG).show();
+                        Toast.makeText(getActivity(), snext, Toast.LENGTH_LONG).show();
                     }
                 }));
 
     }
     // [END delete_fan_out]
 
-    private void getDialog(String postkey) {
+    private void getDialog(String postkey, Attendance model) {
 
         // custom dialog
         final Dialog dialog = new Dialog(getActivity());
@@ -363,7 +380,7 @@ private void getDialog(String postkey) {
 
             public void onClick(View v) {
                 dialog.dismiss();
-                approvePost(abskeydel, 1);
+                approvePost(abskeydel, 1, model);
             }
         });
         Button buttonRefuse = (Button) dialog.findViewById(R.id.buttonRefuse);
@@ -372,7 +389,7 @@ public void onClick(View v) {
 
             public void onClick(View v) {
                 dialog.dismiss();
-                approvePost(abskeydel, 0);
+                approvePost(abskeydel, 0, model);
 
 
             }

app/src/main/java/com/eusecom/attendance/models/Attendance.java

@@ -140,5 +140,17 @@ public String getDatsString() {
         return datss;
     }
 
+    @Exclude
+    public String getDmxa() {
+
+        return dmxa;
+    }
+
+    @Exclude
+    public String getDaod() {
+
+        return daod;
+    }
+
 }
 // [END blog_user_class]

app/src/main/java/com/eusecom/attendance/retrofit/RfContributor.java

@@ -3,4 +3,5 @@
 public class RfContributor {
     public String login;
     public long contributions;
+    public String memo;
 }

app/src/main/java/com/eusecom/attendance/retrofit/RfEtestApi.java

@@ -1,11 +1,15 @@
 package com.eusecom.attendance.retrofit;
 
+import com.eusecom.attendance.models.Attendance;
+
 import java.util.List;
 
 import io.reactivex.Observable;
+import retrofit2.http.Body;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
@@ -72,8 +76,13 @@ public interface RfEtestApi {
     /**
      * See https://developer.github.com/v3/repos/#list-contributors
      */
+    @FormUrlEncoded
+    @POST("/attendance/contributor.php")
+    Observable<List<RfContributor>> contributors(@Field("savetofir") String savetofir, @Field("keyf") String keyf,
+                                                 @Field("whoapprove") String whoapprove, @Field("approveabs_json") String approveabs_json);
+
     @GET("/attendance/contributor.php")
-    Observable<List<RfContributor>> contributors(@Query("owner") String owner,
+    Observable<List<RfContributor>> contributorsGET(@Query("owner") String owner,
                                                  @Query("repo") String repo);
 
     @GET("/attendance/contributor.json")

app/src/main/java/com/eusecom/attendance/retrofit/RfEtestService.java

@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 
+import com.eusecom.attendance.SettingsActivity;
 import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 
 import okhttp3.OkHttpClient;
@@ -16,10 +17,13 @@ public class RfEtestService {
     private RfEtestService() {
     }
 
-    public static RfEtestApi createGithubService(final String githubToken) {
+    public static RfEtestApi createGithubService(final String githubToken, final String urlx) {
+
+
         Retrofit.Builder builder = new Retrofit.Builder().addCallAdapterFactory(RxJava2CallAdapterFactory.create())
               .addConverterFactory(GsonConverterFactory.create())
-              .baseUrl("http://www.eshoptest.sk");
+              .baseUrl(urlx);
+              //.baseUrl("http://www.eshoptest.sk");
               //.baseUrl("https://api.github.com");
 
         if (!TextUtils.isEmpty(githubToken)) {