Projects >> ySchool >>664e2d257140e4db2a704c371e8b847732bcb1ba

Chunk
Conflicting content
    public boolean preloadStudent() {
        this.setStudent(analyticsService.getStudent());
<<<<<<< HEAD
        matchingStudentProfile = new MatchingStudentProfile(this.getStudent());
       // matchingStudentProfile.setOlSubjects(new ListDataModel(analyticsService.getOLSubjects(this.getStudent())));

       // matchingStudentProfile.setAlSubjects(new ListDataModel(analyticsService.getALSubjects(this.getStudent())));
        List subjectResultList = new ArrayList<>();
        List classroomSubjectList = analyticsService.getALSubjects(this.getStudent());
        Iterator classroomSubjectIterator = classroomSubjectList.iterator();
        while (classroomSubjectIterator.hasNext()){
            ClassroomSubject classroomSubject = classroomSubjectIterator.next();
            String result =  analyticsService.getALSubjectsResult(this.getStudent(), classroomSubject) ;
            SubjectResult subjectResult = new SubjectResult(classroomSubject,result);
            subjectResultList.add(subjectResult);
=======
>>>>>>> 09d66aa187f7e971a7d1ec0b08f3513703825167


        return true;
Solution content
    public boolean preloadStudent() {
        this.setStudent(analyticsService.getStudent());



        return true;
File
AnalyticsBean.java
Developer's decision
Version 2
Kind of conflict
Comment