From d70378e110ad2b66b6af419beaa1343705cb709b Mon Sep 17 00:00:00 2001
From: darshanxyz <darshanxyz@gmail.com>
Date: Sun, 16 Apr 2017 18:31:23 +0530
Subject: [PATCH] Added onRequestClick method
---
.../darshanbshah/odsystem/HoursFragment.java | 6 ++++-
.../darshanbshah/odsystem/MainActivity.java | 26 +++++++++++++++++++
.../com/darshanbshah/odsystem/RollNumber.java | 21 ++++++++++++---
app/src/main/res/layout/activity_main.xml | 3 ++-
4 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java b/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java
index d4a5c42..4ad1f13 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/HoursFragment.java
@@ -3,9 +3,14 @@ package com.darshanbshah.odsystem;
import android.os.Bundle;
import android.support.v4.app.Fragment;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.Toast;
+
+import java.util.ArrayList;
public class HoursFragment extends Fragment {
@@ -19,5 +24,4 @@ public class HoursFragment extends Fragment {
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_hours, container, false);
}
-
}
diff --git a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
index e662031..8bf933c 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/MainActivity.java
@@ -4,10 +4,14 @@ import android.app.DatePickerDialog;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
+import android.widget.CheckBox;
import android.widget.DatePicker;
+import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.TextView;
+import android.widget.Toast;
import com.google.firebase.auth.FirebaseAuth;
@@ -20,6 +24,8 @@ public class MainActivity extends AppCompatActivity {
Calendar calendar = Calendar.getInstance();
TextView from, to;
FrameLayout frameLayout;
+ EditText reason;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -30,8 +36,11 @@ public class MainActivity extends AppCompatActivity {
from = (TextView)findViewById(R.id.fromDateTV);
to = (TextView)findViewById(R.id.toDateTV);
frameLayout = (FrameLayout) findViewById(R.id.hours_frame_layout);
+ reason = (EditText)findViewById(R.id.reasonEditText);
}
+
+
public void onClickFromDatePicker(View view) {
new DatePickerDialog(this, fromListener, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show();
}
@@ -61,6 +70,14 @@ public class MainActivity extends AppCompatActivity {
}
+
+ StringBuilder checks = new StringBuilder();
+
+ public void hour1Checked(View view) {
+ checks.append("1, ");
+ Toast.makeText(getApplicationContext(), checks, Toast.LENGTH_SHORT).show();
+ }
+
public void onHoursClick(View view) {
android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
android.support.v4.app.FragmentTransaction transaction = manager.beginTransaction();
@@ -70,6 +87,15 @@ public class MainActivity extends AppCompatActivity {
transaction.commit();
}
+ String reasonString, fromDate, toDate;
+ public void onRequestClick(View view) {
+ reasonString = reason.getText().toString();
+ fromDate = from.getText().toString();
+ toDate = to.getText().toString();
+
+ Log.e("DATA: ", reasonString + ", " + fromDate + ", " + toDate);
+ }
+
public void signOut(View view) {
mAuth.signOut();
startActivity(new Intent(this, Login.class));
diff --git a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java b/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
index 1333868..3352dbd 100644
--- a/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
+++ b/app/src/main/java/com/darshanbshah/odsystem/RollNumber.java
@@ -17,9 +17,16 @@ import android.widget.TextView;
import android.widget.Toast;
import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.database.ChildEventListener;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
+import com.google.firebase.database.ValueEventListener;
+
+import java.util.ArrayList;
+import java.util.List;
public class RollNumber extends AppCompatActivity implements AdapterView.OnItemSelectedListener{
@@ -30,9 +37,13 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference root = database.getReference();
- DatabaseReference user = root.child(mAuth.getCurrentUser().getUid());
- DatabaseReference roll_no = user.child("RollNumber");
- DatabaseReference email = user.child("Email");
+ DatabaseReference student = root.child("Student");
+ DatabaseReference id = student.child(mAuth.getCurrentUser().getUid());
+ DatabaseReference roll_no = id.child("RollNumber");
+ DatabaseReference email = id.child("Email");
+ DatabaseReference advisor = id.child("Advisor");
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -45,6 +56,7 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
advisors.setAdapter(adapter);
advisors.setOnItemSelectedListener(this);
+
SharedPreferences preferences = getSharedPreferences("ActivityPREF", Context.MODE_PRIVATE);
if(preferences.getBoolean("activity_executed", false)){
@@ -57,12 +69,15 @@ public class RollNumber extends AppCompatActivity implements AdapterView.OnItemS
edit.putBoolean("activity_executed", true);
edit.commit();
}
+
+
}
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
TextView textView = (TextView)view;
+ advisor.setValue(textView.getText());
Toast.makeText(this, textView.getText(), Toast.LENGTH_SHORT).show();
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be12dd5..c8e58c2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -148,7 +148,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/requestButton"
- android:layout_marginTop="@dimen/activity_vertical_margin"/>
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:onClick="onRequestClick" />
</LinearLayout>
--
GitLab