From 4efa466b8c35cfe3034dcff66ca91cc5ed1b10c2 Mon Sep 17 00:00:00 2001 From: ruhullah muhammad Date: Thu, 16 Dec 2021 06:43:09 -0800 Subject: [PATCH] performance improvements, removed code, ID image --- .../example/attendancemgr/MainActivity2.java | 7 +---- .../example/attendancemgr/enrolActivity.java | 30 ++++++++++++++++--- .../ui/Courses/CoursesFragment.java | 11 ------- app/src/main/res/layout/activity_enrol.xml | 2 +- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/example/attendancemgr/MainActivity2.java b/app/src/main/java/com/example/attendancemgr/MainActivity2.java index 0f119c4..6629788 100644 --- a/app/src/main/java/com/example/attendancemgr/MainActivity2.java +++ b/app/src/main/java/com/example/attendancemgr/MainActivity2.java @@ -290,7 +290,7 @@ private JSONArray prepareRecordJsonArray() throws JSONException { attArray.put(new JSONObject().put("enrol_course", new JSONArray(course.getCourse())) .put("AdmNo", course.getAdmNo()) .put("fp", Base64.encodeToString(course.getFP(), Base64.DEFAULT)) - .put("IDImg", Base64.encodeToString(course.getIDImg(), Base64.DEFAULT)) + .put("IDImg", "") ); } else { //for added courses @@ -312,14 +312,9 @@ private JSONArray prepareRecordJsonArray() throws JSONException { } } attArray.put(new JSONObject().put("uname", getUsername())); - attArray.put(new JSONObject().put("code", getCode())); return attArray; } - private String getCode() { - SharedPreferences preferences = this.getSharedPreferences("code file", MODE_PRIVATE); - return preferences.getString("code", NO_DATA); - } private String getUsername(){ SharedPreferences preferences = this.getSharedPreferences(ID_FILE, MODE_PRIVATE); diff --git a/app/src/main/java/com/example/attendancemgr/enrolActivity.java b/app/src/main/java/com/example/attendancemgr/enrolActivity.java index 17dc2fd..46d3f7e 100644 --- a/app/src/main/java/com/example/attendancemgr/enrolActivity.java +++ b/app/src/main/java/com/example/attendancemgr/enrolActivity.java @@ -41,6 +41,8 @@ import java.util.Set; import java.util.StringJoiner; +import static com.example.attendancemgr.MainActivity2.NO_DATA; + public class enrolActivity extends AppCompatActivity { private static String chosenCourse, admNo, receivedCourse, MODE; EditText admNoView; @@ -65,6 +67,7 @@ public class enrolActivity extends AppCompatActivity { private final ActivityResultCallback scanCallback = result -> { if (result.getResultCode() == Activity.RESULT_OK) { + storeSpinnerData((String) facultySpinner.getSelectedItem(), (String) deptSpinner.getSelectedItem()); MODE = NEW; mToolbar.setSubtitle("New Enrollment"); selectedCourses.setText(""); @@ -216,6 +219,11 @@ public void onNothingSelected(AdapterView parent) { } }); + String[] spinnerData = getSpinnerData(); + if (!spinnerData[1].equals(NO_DATA)){ + facultySpinner.setSelection(facSpinnerAdapter.getPosition(spinnerData[0])); + deptSpinner.setSelection(deptSpinnerAdapter.getPosition(spinnerData[1])); + } allCoursesLiveData.observe(this, agentCourses -> { allCourses = agentCourses; @@ -238,7 +246,7 @@ public void onNothingSelected(AdapterView parent) { if (admNoView.getText().length() != 0 && selectedCourses.getText().length() != 0 /*&& !pb_is_Visible*/) { admNo = admNoView.getText().toString(); - snapLauncher.launch(null); + launchFPScan(); } else { Toast.makeText(this, "Admission number or courses field empty!", Toast.LENGTH_SHORT).show(); } @@ -266,7 +274,7 @@ public void onNothingSelected(AdapterView parent) { switch (menuItem.getTitle().toString()){ case "New": mToolbar.setSubtitle("New Enrollment"); - snapButton.setText(R.string.capture_id); + snapButton.setText(R.string.scan_finger); MODE = NEW; break; case "Add": @@ -329,14 +337,14 @@ private void processResult(Object[] resultObj){ admNo, (byte[]) resultObj[0], EnrolCourse.Sub_Status.unsubmitted, - IDCardbytes)); + null)); } else { mCourseViewModel.insert(new EnrolCourse(Arrays.toString(removeSpace(coursesList).toArray()), admNo, (byte[]) resultObj[0], EnrolCourse.Sub_Status.unsubmitted, - IDCardbytes)); + null)); if (receivedCourse != null) { @@ -415,4 +423,18 @@ private void addCourses(){ coursesList = new LinkedList<>(); Toast.makeText(this, "Course(s) added successfully", Toast.LENGTH_SHORT).show(); } + + private void storeSpinnerData(String faculty, String dept){ + SharedPreferences sharedPref = getSharedPreferences(MainActivity2.JOBS_FILE, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sharedPref.edit(); + editor.putString("Faculty", faculty); + editor.putString("Dept.", dept); + editor.apply(); + } + + private String[] getSpinnerData(){ + SharedPreferences preferences = this.getSharedPreferences(MainActivity2.JOBS_FILE, MODE_PRIVATE); + String defaultData = NO_DATA; + return new String[]{preferences.getString("Faculty", defaultData), preferences.getString("Dept.", defaultData)}; + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/attendancemgr/ui/Courses/CoursesFragment.java b/app/src/main/java/com/example/attendancemgr/ui/Courses/CoursesFragment.java index 72cfa2a..636370d 100644 --- a/app/src/main/java/com/example/attendancemgr/ui/Courses/CoursesFragment.java +++ b/app/src/main/java/com/example/attendancemgr/ui/Courses/CoursesFragment.java @@ -622,10 +622,6 @@ private void storeAttendanceData(String data) throws JSONException { } - JSONArray codeArray = jsonArray.getJSONArray(2); - JSONObject obj = codeArray.getJSONObject(0); - String code = obj.getString("code"); - storeCode(code); SharedPreferences sharedPref = getActivity().getSharedPreferences("Tutors", Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedPref.edit(); @@ -641,13 +637,6 @@ private void savePassCode(String passcode) { editor.apply(); } - private void storeCode(String code) { - SharedPreferences sharedPref = getActivity().getSharedPreferences("code file", Context.MODE_PRIVATE); - SharedPreferences.Editor editor = sharedPref.edit(); - editor.putString("code", code); - editor.apply(); - } - private String getUsername(){ SharedPreferences preferences = getActivity().getSharedPreferences(ID_FILE, MODE_PRIVATE); return preferences.getString(USERNAME, NO_DATA); diff --git a/app/src/main/res/layout/activity_enrol.xml b/app/src/main/res/layout/activity_enrol.xml index 287021e..53b83ff 100644 --- a/app/src/main/res/layout/activity_enrol.xml +++ b/app/src/main/res/layout/activity_enrol.xml @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:text="@string/capture_id" + android:text="@string/scan_finger" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toStartOf="parent"