Ignore:
Timestamp:
02/23/25 20:37:56 (4 months ago)
Author:
ste08 <sjovanoska@…>
Branches:
master
Children:
fda671c
Parents:
de83113
git-author:
ste08 <sjovanoska@…> (02/23/25 20:37:23)
git-committer:
ste08 <sjovanoska@…> (02/23/25 20:37:56)
Message:

Report working, Wishlist partly working.

Location:
src/main/java/com/example/skychasemk/model
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src/main/java/com/example/skychasemk/model/SupportTicket.java

    rde83113 r62bba0c  
    33import jakarta.persistence.*;
    44import lombok.Getter;
     5import lombok.Setter;
    56
    67import java.time.LocalDate;
     
    1011public class SupportTicket {
    1112
     13    @Setter
    1214    @Id
    1315    @GeneratedValue(strategy = GenerationType.IDENTITY)
     
    1517
    1618    private Integer ticketID;
     19    @Setter
    1720    @Getter
    18     @Column(name = "UserID")
     21    @Column(name = "userid")
    1922
    20     private Integer userID;
     23    private Integer userId;
    2124
     25    @Setter
    2226    @Getter
    2327    @Column(name = "Description")
    2428
    2529    private String description;
     30    @Setter
     31
    2632    @Getter
    2733    @Column(name = "status")
    2834    @Enumerated(EnumType.STRING)
    2935    private TicketStatus status;
     36    @Setter
    3037    @Column(name = "date_created")
    3138
    3239    private LocalDate dateCreated;
     40    @Setter
    3341    @Getter
    3442    @Column(name = "date_resolved")
    3543
    3644    private LocalDate dateResolved;
     45    @Setter
    3746    @Column(name = "assigned_to")
    3847
     
    4453    }
    4554
    46     public TicketStatus getStatus() {
    47         return status;
    48     }
    49 
    50     public Integer getTicketID() {
    51         return ticketID;
    52     }
    53 
    54     public void setTicketID(Integer ticketID) {
    55         this.ticketID = ticketID;
    56     }
    57 
    58     public void setUserID(Integer userID) {
    59         this.userID = userID;
    60     }
    61 
    62 
    63     public void setDescription(String description) {
    64         this.description = description;
    65     }
    66 
    67     public void setStatus(TicketStatus status) {
    68         this.status = status;
    69     }
    7055
    7156    public LocalDate getDateCreated(LocalDate now) {
     
    7358    }
    7459
    75     public void setDateCreated(LocalDate dateCreated) {
    76         this.dateCreated = dateCreated;
    77     }
    78 
    79     public void setDateResolved(LocalDate dateResolved) {
    80         this.dateResolved = dateResolved;
    81     }
    82 
    83     public void setAssignedTo(Integer assignedTo) {
    84         this.assignedTo = assignedTo;
    85     }
    8660}
  • src/main/java/com/example/skychasemk/model/TopMonthlyReport.java

    rde83113 r62bba0c  
    11package com.example.skychasemk.model;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
     4import lombok.Getter;
     5import lombok.Setter;
     6import org.hibernate.annotations.Immutable;
    77
    88import java.time.LocalDate;
    9 
     9@Setter
     10@Getter
    1011@Entity
    1112@Table(name="topmonhtlyreport")
     13@IdClass(TopMonthlyReportId.class) // Define composite key
     14
    1215public class TopMonthlyReport {
     16    // Getters and Setters
    1317    @Id
    1418    @Column(name = "month")
    1519    private LocalDate month;
    16 
     20    @Id
    1721    @Column(name = "category")
    1822    private String category;
    19 
     23    @Id
    2024    @Column(name = "name")
    2125    private String name;
    22 
    2326    @Column(name = "count")
    2427    private int count;
    2528
    26     // Getters and Setters
    27     public LocalDate getMonth() {
    28         return month;
    29     }
    30 
    31     public void setMonth(LocalDate month) {
    32         this.month = month;
    33     }
    34 
    35     public String getCategory() {
    36         return category;
    37     }
    38 
    39     public void setCategory(String category) {
    40         this.category = category;
    41     }
    42 
    43     public String getName() {
    44         return name;
    45     }
    46 
    47     public void setName(String name) {
    48         this.name = name;
    49     }
    50 
    51     public int getCount() {
    52         return count;
    53     }
    54 
    55     public void setCount(int count) {
    56         this.count = count;
    57     }
    5829}
  • src/main/java/com/example/skychasemk/model/WebConfig.java

    rde83113 r62bba0c  
    3434        registry.addViewController("/transaction").setViewName("forward:/TransactionPage.html");
    3535        registry.addViewController("/login").setViewName("forward:/UserLogin.html");
    36         registry.addViewController("/wishlist").setViewName("forward:/WishlistPage.html");
     36        registry.addViewController("/wishlist").setViewName("forward:/Wishlist.html");
    3737        registry.addViewController("/signup").setViewName("forward:/UserSignup.html");
     38        registry.addViewController("/views").setViewName("forward:/ViewReport.html");
    3839    }
    3940
  • src/main/java/com/example/skychasemk/model/Wishlist.java

    rde83113 r62bba0c  
    33import jakarta.persistence.*;
    44import lombok.Getter;
     5import lombok.Setter;
    56
    67import java.time.LocalDate;
     
    1617
    1718    private Integer wishlistID;
    18     @Column(name = "userId")
     19    @Setter
     20    @Column(name = "userid")
    1921
    20     private Integer userID;
    21     @Column(name = "targetId")
     22    private Integer userId;
     23    @Setter
     24    @Column(name = "targetid")
    2225
    23     private Integer targetID;
     26    private Integer targetId;
     27    @Setter
     28    @Getter
    2429    @Column(name = "date_added")
     30    private LocalDate date_added;
    2531
    26     private LocalDate dateAdded;
    2732
    28     public Integer getWishlistID() {
    29         return wishlistID;
    30     }
    31 
    32     public void setWishlistID(Integer wishlistID) {
    33         this.wishlistID = wishlistID;
    34     }
    35 
    36     public Integer getUserID() {
    37         return userID;
    38     }
    39 
    40     public void setUserID(Integer userID) {
    41         this.userID = userID;
    42     }
    43 
    44     public Integer getTargetID() {
    45         return targetID;
    46     }
    47 
    48     public void setTargetID(Integer targetID) {
    49         this.targetID = targetID;
    50     }
    51 
    52     public LocalDate getDateAdded() {
    53         return dateAdded;
    54     }
    55 
    56     public void setDateAdded(LocalDate dateAdded) {
    57         this.dateAdded = dateAdded;
    58     }
    5933}
    6034
Note: See TracChangeset for help on using the changeset viewer.