Skip to content

Codecrew / Moya

Go to a project
Merge Request !92 opened by

Lectures

Kurssit ja luennot, tuki niille, eka versio.

Tämä tulee todennäköisesti confligtamaan tuomarin version kanssa -> kun tuomari on mergetetty niin tulen mergettvmään masterin tähän ja päivittää tän requestin, mut loin jo valmiiksi previewiä varten.

Edited
Request to merge tkfftk:lectures into master

Merged

  • The changes were merged into master.
  • The source branch has been removed.
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
    136 lectureFacade.merge(lecture);
    137
    138 targetUser.getLectures().add(lecture);
    139
    140 return lecture;
    141 }
    142
    143 @Override
    144 @RolesAllowed({LecturePermission.S_VIEW, LecturePermission.S_MANAGE})
    145 public Lecture unparticipate(EventUser user, Lecture lecture) {
    146
    147 EventUser targetUser = eventUserFacade.reload(user);
    148
    149 lecture.getParticipants().remove(targetUser);
    150 targetUser.getLectures().remove(lecture);
    151 lectureFacade.merge(lecture);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
    123 }
    124
    125 @Override
    126 @RolesAllowed({LecturePermission.S_VIEW, LecturePermission.S_MANAGE})
    127 public Lecture participate(EventUser user, Lecture lecture) {
    128
    129 if(userLectureSelectsLeft(lecture.getLectureGroup(), user) <= 0)
    130 return lecture;
    131
    132 EventUser targetUser = eventUserFacade.reload(user);
    133
    134 lecture.getParticipants().add(targetUser);
    135
    136 lectureFacade.merge(lecture);
    137
    138 targetUser.getLectures().add(lecture);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
    92 }
    93
    94 return lecture;
    95 }
    96
    97 @Override
    98 @RolesAllowed({LecturePermission.S_VIEW, LecturePermission.S_MANAGE})
    99 public List<Lecture> findAvailableLectures(LectureGroup group, EventUser user) {
    100
    101 LectureGroup lectureGroup = lectureGroupFacade.reload(group);
    102 List<Role> userRoles = userBean.findUsersRoles(user);
    103
    104 List<Lecture> lectures = new ArrayList<Lecture>();
    105
    106
    107 lectureloop: for (Lecture l : lectureGroup.getLectures()) {
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
    26
    27 @EJB
    28 LectureFacade lectureFacade;
    29 @EJB
    30 LectureGroupFacade lectureGroupFacade;
    31 @EJB
    32 EventUserFacade eventUserFacade;
    33 @EJB
    34 EventBean eventBean;
    35
    36 @EJB
    37 UserBeanLocal userBean;
    38
    39 @Override
    40 public List<Lecture> getLecturesByLectureGroup(LectureGroup group) {
    41 return new ArrayList<Lecture>();
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaDatabase/src/fi/codecrew/moya/model/Lecture.java
    45
    46
    47 @ManyToOne
    48 @JoinColumn(name = "lecture_group_id", referencedColumnName = LectureGroup.ID_COLUMN)
    49 private LectureGroup lectureGroup;
    50
    51
    52 @ManyToMany()
    53 @JoinTable(name = "lecture_participants",
    54 joinColumns = { @JoinColumn(name = "lecture_id", referencedColumnName = Lecture.ID_COLUMN) },
    55 inverseJoinColumns = { @JoinColumn(name = "eventuser_id", referencedColumnName = EventUser.ID_COLUMN) })
    56 private List<EventUser> participants;
    57
    58
    59 @ManyToMany()
    60 @JoinTable(name = "lecture_roles",
    • @tuomari commented
      Owner

      Olisiko tähän hyvä laittaa uniqueConstraint? 

      uniqueConstraints = {
                    @UniqueConstraint(columnNames = { "lecture_id", "role_id" })
            }

      (Pitää vaan muistaa päivittää myös DbManager)

      Edited
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff
    code/MoyaDatabase/src/fi/codecrew/moya/model/LectureGroup.java
    1 /*
    • @tuomari commented
      Owner

      Tälle voisi ajaa formatin. Sisennykset näyttäisi menevän hassusti.

      Itse tykkään eclipsen ominaisuudesta että se ajaa formatin kaikille tiedostoille tallennuksessa: Preferences -> Java -> Editor -> Save Actions -> Format all lines
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!