Phil 1 rok temu
rodzic
commit
07f3fc48b6

+ 74 - 0
src/main/java/com/example/application/data/DataThingy.java

@@ -0,0 +1,74 @@
+package com.example.application.data;
+
+public class DataThingy {
+
+    private String path = "C:/tst/test.txt";
+    private boolean set = true;
+    private int sum_l = 0;
+    private int sum_r = 0;
+
+    public DataThingy(){
+
+    }
+
+    private void calc(String[] vals_l, String[] vals_r){
+        int tmp_l = 0;
+        int tmp_r = 0;
+
+        if(set){
+            for(String s : vals_l){
+                if(s.equals("m"))
+                    tmp_l += 0;
+                if(s.equals("x"))
+                    tmp_l += 10;
+                if(!s.isBlank())
+                    tmp_l += Integer.valueOf(s);
+            }
+            for(String s : vals_r){
+                if(s.equals("m"))
+                    tmp_r += 0;
+                if(s.equals("x"))
+                    tmp_r += 10;
+                if(!s.isBlank())
+                    tmp_r += Integer.valueOf(s);
+            }
+            if(tmp_l > tmp_r){
+                sum_l += 2;
+            }else if(tmp_l > tmp_r){
+                sum_r += 2;
+            }else{
+                sum_l ++;
+                sum_r ++;
+            }
+        }else{
+            for(String s : vals_l){
+                if(s.equals("m"))
+                    tmp_l += 0;
+                if(s.equals("x"))
+                    tmp_l += 10;
+                if(!s.isBlank())
+                    tmp_l += Integer.valueOf(s);
+            }
+            for(String s : vals_r){
+                if(s.equals("m"))
+                    tmp_r += 0;
+                if(s.equals("x"))
+                    tmp_r += 10;
+                if(!s.isBlank())
+                    tmp_r += Integer.valueOf(s);
+            }
+            sum_l += tmp_l;
+            sum_r += tmp_r;
+        }
+
+    }
+
+    public void write(String[] vals_l, String[] vals_r){
+        calc(vals_l,vals_r);
+
+
+    }
+
+
+    //enum
+}

+ 0 - 52
src/main/java/com/example/application/data/entity/AbstractEntity.java

@@ -1,52 +0,0 @@
-package com.example.application.data.entity;
-
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.MappedSuperclass;
-import jakarta.persistence.SequenceGenerator;
-import jakarta.persistence.Version;
-
-@MappedSuperclass
-public abstract class AbstractEntity {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idgenerator")
-    // The initial value is to account for data.sql demo data ids
-    @SequenceGenerator(name = "idgenerator", initialValue = 1000)
-    private Long id;
-
-    @Version
-    private int version;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    @Override
-    public int hashCode() {
-        if (getId() != null) {
-            return getId().hashCode();
-        }
-        return super.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof AbstractEntity that)) {
-            return false; // null or not an AbstractEntity class
-        }
-        if (getId() != null) {
-            return getId().equals(that.getId());
-        }
-        return super.equals(that);
-    }
-}

+ 0 - 34
src/main/java/com/example/application/data/entity/Company.java

@@ -1,34 +0,0 @@
-package com.example.application.data.entity;
-
-import jakarta.annotation.Nullable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.constraints.NotBlank;
-import java.util.LinkedList;
-import java.util.List;
-
-@Entity
-public class Company extends AbstractEntity {
-    @NotBlank
-    private String name;
-
-    @OneToMany(mappedBy = "company")
-    @Nullable
-    private List<Contact> employees = new LinkedList<>();
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Contact> getEmployees() {
-        return employees;
-    }
-
-    public void setEmployees(List<Contact> employees) {
-        this.employees = employees;
-    }
-}

+ 0 - 78
src/main/java/com/example/application/data/entity/Contact.java

@@ -1,78 +0,0 @@
-package com.example.application.data.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
-@Entity
-public class Contact extends AbstractEntity {
-
-    @NotEmpty
-    private String firstName = "";
-
-    @NotEmpty
-    private String lastName = "";
-
-    @ManyToOne
-    @JoinColumn(name = "company_id")
-    @NotNull
-    @JsonIgnoreProperties({"employees"})
-    private Company company;
-
-    @NotNull
-    @ManyToOne
-    private Status status;
-
-    @Email
-    @NotEmpty
-    private String email = "";
-
-    @Override
-    public String toString() {
-        return firstName + " " + lastName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-}

+ 0 - 25
src/main/java/com/example/application/data/entity/Status.java

@@ -1,25 +0,0 @@
-package com.example.application.data.entity;
-
-import jakarta.persistence.Entity;
-
-@Entity
-public class Status extends AbstractEntity {
-    private String name;
-
-    public Status() {
-
-    }
-
-    public Status(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}

+ 0 - 8
src/main/java/com/example/application/data/repository/CompanyRepository.java

@@ -1,8 +0,0 @@
-package com.example.application.data.repository;
-
-import com.example.application.data.entity.Company;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface CompanyRepository extends JpaRepository<Company, Long> {
-
-}

+ 0 - 8
src/main/java/com/example/application/data/repository/ContactRepository.java

@@ -1,8 +0,0 @@
-package com.example.application.data.repository;
-
-import com.example.application.data.entity.Contact;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface ContactRepository extends JpaRepository<Contact, Long> {
-
-}

+ 0 - 8
src/main/java/com/example/application/data/repository/StatusRepository.java

@@ -1,8 +0,0 @@
-package com.example.application.data.repository;
-
-import com.example.application.data.entity.Status;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface StatusRepository extends JpaRepository<Status, Long> {
-
-}

+ 12 - 10
src/main/java/com/example/application/views/list/Spotting.java

@@ -2,6 +2,7 @@ package com.example.application.views.list;
 
 import com.google.gson.Gson;
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.TextField;
@@ -16,6 +17,7 @@ import java.io.IOException;
 @PageTitle("Spotting")
 @Route(value = "spotting")
 public class Spotting extends HorizontalLayout {
+    private boolean start_right = false;
     private BufferedWriter writer;
     //left
     VerticalLayout left = new VerticalLayout(Alignment.END);
@@ -33,38 +35,38 @@ public class Spotting extends HorizontalLayout {
 
 
     public Spotting(){
-
         left.add(left_one,left_two,left_three);
         right.add(right_one,right_two,right_three);
         init_listeners();
         add(left,right);
-
     }
 
     private void init_listeners(){
         for (Component c : left.getChildren().toList()){
-            if(c instanceof TextField)
+            if(c instanceof TextField){
                 ((TextField)c).addValueChangeListener(textFieldStringComponentValueChangeEvent -> write());
+                ((TextField)c).setAllowedCharPattern("[0-9mx]");
+                ((TextField)c).setMaxLength(1);
+            }
         }
         for (Component c : right.getChildren().toList()){
-            if(c instanceof TextField)
-                ((TextField)c).addValueChangeListener(textFieldStringComponentValueChangeEvent -> write());
+            if(c instanceof TextField) {
+                ((TextField) c).addValueChangeListener(textFieldStringComponentValueChangeEvent -> write());
+                ((TextField) c).setAllowedCharPattern("[0-9mx]");
+                ((TextField)c).setMaxLength(1);
+            }
         }
 
     }
 
     private void write(){
         Gson gson = new Gson();
-        String vals[] = {left_one.getValue(),left_two.getValue(),left_three.getValue(),right_one.getValue(),right_two.getValue(),right_two.getValue()};
-        for (String s : vals)
-            System.out.println(s);
+        String vals[] = {left_one.getValue()left_two.getValue(),left_three.getValue(),right_one.getValue(),right_two.getValue(),right_three.getValue()};
         try {
-            System.out.println("writey ditey");
             writer = new BufferedWriter(new FileWriter("C:/tst/test.txt"));
             writer.write(gson.toJson(vals));
             writer.close();
         } catch (IOException e) {
-            System.out.println("fooook");
             throw new RuntimeException(e);
         }
     }