Skip to content

Commit cc0d894

Browse files
last changes
1 parent f71843a commit cc0d894

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

.idea/misc.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/edu/sharif/homework1/StudentTrainingPageFragment.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public View onCreateView(
4646
student = (Student) User.getUserByUsername(studentUsername);
4747
studentAnswer = thisTraining.getAnswerByStudentUsername(studentUsername);
4848

49-
currentAnswer = (studentAnswer == null? "-" : studentAnswer.getAnswerText());
50-
currentGrade = (studentAnswer == null || !studentAnswer.isGradeSet()? "-" :
49+
currentAnswer = (studentAnswer == null ? "-" : studentAnswer.getAnswerText());
50+
currentGrade = (studentAnswer == null || !studentAnswer.isGradeSet() ? "-" :
5151
String.valueOf(studentAnswer.getGrade()));
5252

5353

@@ -59,22 +59,19 @@ public View onCreateView(
5959
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
6060
super.onViewCreated(view, savedInstanceState);
6161

62-
binding.trainingNameText.setText("Professor: " + professorUsername + "\n"
63-
+ "Class: " + className + "\n"
64-
+ "Training: " + trainingName + "\n"
65-
+ "Current Answer: " + currentAnswer + "\n"
66-
+ "Current Grade: " + currentGrade);
62+
binding.trainingNameText.setText(getStudentGradingText());
6763

6864
binding.submitTrainingButton.setOnClickListener(view1 -> {
6965
String answerText = binding.answerText.getText().toString();
7066

7167
if (answerText.isEmpty()) {
7268
Toast.makeText(getContext(),
7369
"Please fill the answer field.", Toast.LENGTH_LONG).show();
74-
}
75-
else {
70+
} else {
7671
addAnswerToTraining(answerText);
72+
currentAnswer = answerText;
7773
Toast.makeText(getContext(), "Your answer has been submitted", Toast.LENGTH_LONG).show();
74+
binding.trainingNameText.setText(getStudentGradingText());
7875
}
7976
});
8077
}
@@ -110,4 +107,11 @@ public void onDestroyView() {
110107
binding = null;
111108
}
112109

110+
private String getStudentGradingText() {
111+
return "Professor: " + professorUsername + "\n"
112+
+ "Class: " + className + "\n"
113+
+ "Training: " + trainingName + "\n"
114+
+ "Current Answer: " + currentAnswer + "\n"
115+
+ "Current Grade: " + currentGrade;
116+
}
113117
}

app/src/main/java/edu/sharif/homework1/TrainingGradingFragment.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,25 @@ public View onCreateView(
4949
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
5050
super.onViewCreated(view, savedInstanceState);
5151

52-
binding.gradingTitle.setText("Student: " + studentUsername + "\n"
53-
+ "Class: " + className + "\n"
54-
+ "Training: " + trainingName + "\n"
55-
+ "Current Grade: " + (thisAnswer.isGradeSet()? thisAnswer.getGrade() : "-"));
52+
binding.gradingTitle.setText(getTrainingGradingText());
5653

5754
binding.gradingSubmit.setOnClickListener(view1 -> {
5855
String gradeString = binding.Grade.getText().toString();
5956

6057
if (gradeString.isEmpty()) {
6158
Toast.makeText(getContext(),
6259
"Please enter the grade.", Toast.LENGTH_LONG).show();
63-
}
64-
else {
60+
} else {
6561
int gradeNumber = Integer.parseInt(gradeString);
6662
if (gradeNumber < 0 || gradeNumber > 100) {
6763
Toast.makeText(getContext(),
6864
"Grade should be between 0 and 100.", Toast.LENGTH_LONG).show();
69-
}
70-
else {
65+
} else {
7166
thisAnswer.setGrade(gradeNumber, getActivity());
7267
thisAnswer.setGradeSet(true, getActivity());
7368
Toast.makeText(getContext(),
7469
"Grade Updated successfully.", Toast.LENGTH_LONG).show();
70+
binding.gradingTitle.setText(getTrainingGradingText());
7571
}
7672
}
7773
});
@@ -82,4 +78,11 @@ public void onDestroyView() {
8278
super.onDestroyView();
8379
binding = null;
8480
}
81+
82+
private String getTrainingGradingText() {
83+
return "Student: " + studentUsername + "\n"
84+
+ "Class: " + className + "\n"
85+
+ "Training: " + trainingName + "\n"
86+
+ "Current Grade: " + (thisAnswer.isGradeSet() ? thisAnswer.getGrade() : "-");
87+
}
8588
}

app/src/main/java/edu/sharif/homework1/TrainingPageFragment.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,20 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
6969
adapter.setClickListener(this);
7070
recyclerView.setAdapter(adapter);
7171

72-
binding.classNameText.setText("Professor: " + professorUsername + "\n"
73-
+ "Class: " + className + "\n"
74-
+ "Training: " + trainingName);
72+
binding.classNameText.setText(getTrainingPageText());
7573

7674
binding.changeTrainingName.setOnClickListener(view1 -> {
7775
String newTrainingName = binding.newTrainingName.getText().toString();
7876

7977
if (newTrainingName.isEmpty()) {
8078
Toast.makeText(getContext(),
8179
"Please enter the new name.", Toast.LENGTH_LONG).show();
82-
}
83-
else {
80+
} else {
8481
thisTraining.setName(newTrainingName, getActivity());
8582
Toast.makeText(getContext(),
8683
"Training name updated successfully.", Toast.LENGTH_LONG).show();
84+
85+
binding.classNameText.setText(getTrainingPageText());
8786
}
8887
});
8988
}
@@ -105,4 +104,10 @@ public void onItemClick(View view, int position) {
105104
actionTrainingPageFragmentToTrainingGradingFragment(studentUsername,
106105
professorUsername, className, trainingName));
107106
}
107+
108+
private String getTrainingPageText() {
109+
return "Professor: " + professorUsername + "\n"
110+
+ "Class: " + className + "\n"
111+
+ "Training: " + thisTraining.getName();
112+
}
108113
}

0 commit comments

Comments
 (0)