From 70298168cb606a622a314531c0810c819227709b Mon Sep 17 00:00:00 2001 From: Apalak Dutta Date: Mon, 25 Sep 2023 16:14:36 +0530 Subject: [PATCH] Added current date Made api dynamic Changed toast message Changed button enable --- .../femdemo/PermissionRequestActivity.java | 13 +++++++++++-- .../ru/visionlab/femdemo/ReportDetailsActivity.java | 9 ++++++++- .../visionlab/femdemo/login/LoginActivityNew.java | 4 ++-- .../femdemo/register/RegisterFragment.java | 3 ++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java index ef5ad86..239336e 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java @@ -28,7 +28,9 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -55,6 +57,8 @@ public class PermissionRequestActivity extends AppCompatActivity { String Employeeid,Permission_code_o,Permission_code_p; String fromDate,toDate,fromTime,toTime; + String currentDateandTime; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -71,6 +75,12 @@ public class PermissionRequestActivity extends AppCompatActivity { PermissionApprovalList(); PermissionTypes(); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z"); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + currentDateandTime = sdf.format(new Date()); + + System.out.println("Current date and time "+currentDateandTime); + spinner = findViewById(R.id.spinner); ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.spinner_items, android.R.layout.simple_spinner_item); @@ -236,13 +246,12 @@ public class PermissionRequestActivity extends AppCompatActivity { params.put("employeeid", Employeeid); params.put("eleavetype", permission_code); - params.put("datedaytype", "Today"); + params.put("pdate", currentDateandTime); params.put("fromtime", textTimeFrom.getText().toString()); params.put("totime", textTimeTo.getText().toString()); params.put("reason", remarks); params.put("attachment", ""); params.put("userid", "a"); - params.put("@LDate1", ""); if(permission_code.equals("O")){ params.put("startdate", fromDate); params.put("enddate", toDate); diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java index ed4d2a2..9ba5d8e 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java @@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity; import android.app.ProgressDialog; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; import android.widget.ImageButton; @@ -30,11 +31,17 @@ public class ReportDetailsActivity extends AppCompatActivity { ImageView back; + String Employeeid; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_report_details); + SharedPreferences shared = getSharedPreferences("MyPrefs", MODE_PRIVATE); + + Employeeid = shared.getString("Employeeid", ""); + empIdVal = findViewById(R.id.empIdVal); pdateVal = findViewById(R.id.pdateVal); Check_InVal = findViewById(R.id.Check_InVal); @@ -64,7 +71,7 @@ public class ReportDetailsActivity extends AppCompatActivity { public void getReport(){ final ProgressDialog loading = ProgressDialog.show(ReportDetailsActivity.this, "Authenticating", "Please wait ", false, false); - String url= "http://43.242.212.92:7001/api/lgt/AttendanceReport?employeeid="+"101"+"&fromdate="+passingDateFrom+"&todate="+passingDateTo; + String url= "http://43.242.212.92:7001/api/lgt/AttendanceReport?employeeid="+Employeeid+"&fromdate="+passingDateFrom+"&todate="+passingDateTo; StringRequest stringRequest=new StringRequest(Request.Method.GET, url, new com.android.volley.Response.Listener() { @Override public void onResponse(String response) { diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java index 9c70ed4..4bb24f2 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java @@ -632,7 +632,7 @@ public class LoginActivityNew extends AppCompatActivity { String statuscode=jb2.getString("_statusCode"); System.out.println("_employeeid :" + _employeeid); Log.d("status",statuscode); - Toast.makeText(LoginActivityNew.this, statuscode, Toast.LENGTH_SHORT).show(); + //Toast.makeText(LoginActivityNew.this, statuscode, Toast.LENGTH_SHORT).show(); if(statuscode.equals("200")) { @@ -641,7 +641,7 @@ public class LoginActivityNew extends AppCompatActivity { editor.putString("Employeeid",_employeeid); editor.commit(); - Toast.makeText(LoginActivityNew.this, "Success Registration", Toast.LENGTH_SHORT).show(); + Toast.makeText(LoginActivityNew.this, "Login successful", Toast.LENGTH_SHORT).show(); Intent intent=new Intent(LoginActivityNew.this,RegisterActivity.class); startActivity(intent); finish(); diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java index 81318be..a872b76 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java @@ -159,6 +159,7 @@ public class RegisterFragment extends BaseFragment { else if(pass.getText().toString().isEmpty()) { Toast.makeText(getContext(), "Please enter password", Toast.LENGTH_SHORT).show(); + signUp.setEnabled(true); } else { @@ -185,7 +186,7 @@ public class RegisterFragment extends BaseFragment { String statuscode=jb2.getString("_statusCode"); System.out.println("_employeeid :" + _employeeid); Log.d("status",statuscode); - Toast.makeText(getContext(), statuscode, Toast.LENGTH_SHORT).show(); + //Toast.makeText(getContext(), statuscode, Toast.LENGTH_SHORT).show(); if(statuscode.equals("200")) {