Browse Source

Added current date

Made api dynamic
Changed toast message
Changed button enable
pms_issue/31163_FaceVerification
Apalak Dutta 1 year ago
parent
commit
70298168cb
4 changed files with 23 additions and 6 deletions
  1. +11
    -2
      examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java
  2. +8
    -1
      examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java
  3. +2
    -2
      examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java
  4. +2
    -1
      examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java

+ 11
- 2
examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/PermissionRequestActivity.java View File

@ -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<CharSequence> 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);


+ 8
- 1
examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/ReportDetailsActivity.java View File

@ -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<String>() {
@Override
public void onResponse(String response) {


+ 2
- 2
examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java View File

@ -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();


+ 2
- 1
examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java View File

@ -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"))
{


Loading…
Cancel
Save