Ignore:
Timestamp:
02/02/22 19:35:14 (2 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
80ddcae, c71fa06
Parents:
df4089c
Message:

parkingZone and parkingSession services fix

Location:
sources/app/src/main/java/parkup/data
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sources/app/src/main/java/parkup/data/AddUpdateWorker.java

    rdf4089c r98f448a  
    1313    List<String> parkingZones;
    1414    EmployeeStatus status;
    15     String mobileNumber;
     15    String mobile;
    1616    boolean locked;
    1717
    18     public AddUpdateWorker(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobileNumber, boolean locked) {
     18    public AddUpdateWorker(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobile, boolean locked) {
    1919        this.firstName = firstName;
    2020        this.lastName = lastName;
    … …  
    2424        this.parkingZones = parkingZones;
    2525        this.status = status;
    26         this.mobileNumber = mobileNumber;
     26        this.mobile = mobile;
    2727        this.locked = locked;
    2828    }
    … …  
    8484    }
    8585
    86     public String getMobileNumber() {
    87         return mobileNumber;
     86    public String getMobile() {
     87        return mobile;
    8888    }
    8989
    90     public void setMobileNumber(String mobileNumber) {
    91         this.mobileNumber = mobileNumber;
     90    public void setMobile(String mobile) {
     91        this.mobile = mobile;
    9292    }
    9393

  • sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

    rdf4089c r98f448a  
    1515    private String lastName;
    1616    private String email;
    17     private String password;
    1817    private String mobile;
    1918    private UserRole role;
     19    private boolean locked;
     20
     21    public boolean isLocked() {
     22        return locked;
     23    }
     24
     25    public void setLocked(boolean locked) {
     26        this.locked = locked;
     27    }
     28
    2029    private EmployeeStatus status;
    2130    private List<String> pzNames;
    22     private PasswordEncoder passwordEncoder;
    2331
    2432    public WorkerDemoParkingZones(Worker v){
    … …  
    2735        this.lastName = v.getLastName();
    2836        this.email = v.getEmail();
    29         this.password = v.getPassword();
    3037        this.mobile = v.getMobile();
    3138        this.role = v.getRole();
    3239        this.status = v.getStatus();
     40        this.locked=v.isEnabled();
    3341        this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
    3442    }
    … …  
    6674    }
    6775
    68     public String getPassword() {
    69         return password;
    70     }
    71 
    72     public void setPassword(String password) {
    73         this.password = password;
    74     }
    75 
    7676    public String getMobile() {
    7777        return mobile;

  • sources/app/src/main/java/parkup/data/enumarations/UserRole.java

    rdf4089c r98f448a  
    44
    55public enum UserRole implements GrantedAuthority {
    6     GUEST,
    7     REG_USER,
    8     WORKER,
    9     ADMIN;
     6    ROLE_USER,
     7    ROLE_REG_USER,
     8    ROLE_WORKER,
     9    ROLE_ADMIN;
    1010
    1111    @Override
Note: See TracChangeset for help on using the changeset viewer.