リクエスト一覧表示・リクエスト発行がサーバーと通信可

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code リクエスト一覧表示・リクエスト発行がサーバーと通信可 AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification ...updateAreaInformation
1 parent 41a17d3 commit a3b0c8e5f93b6ad7aefb86fa3fd87ce862409ce8 a-hongo authored on 24 Sep 2019

Browse code

AchieveRequests ...updateAreaInformation

1 parent 41a17d3 commit a3b0c8e5f93b6ad7aefb86fa3fd87ce862409ce8

a-hongo authored on 24 Sep 2019

Patch

Unified Split

Showing 6 changed files

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          app/src/main/java/com/example/cosmosclient/entities/Request.java
             package com.example.cosmosclient.entities;
 
import com.fasterxml.jackson.annotation.JsonIgnore;
 
import java.util.Date;
 
public class Request {
    private Date date;
    private Date deadline;
//    private String location;
    private int location;
    @JsonIgnore
    private String name; //消
    private boolean done = false;
 
    public Request() {
    }
 
    public Request(String rId, String uri/*, UserJsonforRequests issuer*/, String product, Date date, Date deadline, int location, String name, boolean done) {
        this.rId = rId;
        this.uri = uri;
 package com.example.cosmosclient.entities;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Date;
 public class Request {
     private Date date;
     private Date deadline;
 //    private String location;
     private int location;
+    @JsonIgnore
     private String name; //消
     private boolean done = false;
+    public Request() {
+    }
     public Request(String rId, String uri/*, UserJsonforRequests issuer*/, String product, Date date, Date deadline, int location, String name, boolean done) {
         this.rId = rId;
         this.uri = uri;

                Ignore Space
               Show notes
              View
            
          
          53 ■■■■■
          app/src/main/java/com/example/cosmosclient/entities/Requests.java
        
        
        
          0 → 100644
             package com.example.cosmosclient.entities;
 
import com.fasterxml.jackson.annotation.JsonIgnore;
 
import java.util.ArrayList;
import java.util.List;
 
public class Requests {
    private List<Request> requests;
 
    public Requests() {
 
    }
 
    public Requests(List<Request> requests) {
        this.requests = requests;
    }
 
    public List<Request> getRequests() {
        return requests;
    }
 
    public void setRequests(List<Request> requests) {
        this.requests = requests;
    }
 
    public void addRequests(Request r) {
        requests.add(r);
    }
 
    public Request getRequest(int index) {
        return requests.get(index);
    }
 
    public void clearRequest() {
        requests.clear();
    }
 
    public void removeRequest(int index) {
        requests.remove(index);
    }
 
    public int getRequestCount() {
        return requests.size();
    }
 
//    @Override
//    public boolean equals(Object other) {
//        if (!(other instanceof Container)) return false;
//        return components.equals(((Container)other).components);
//    }
}
+package com.example.cosmosclient.entities;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.ArrayList;
+import java.util.List;
+public class Requests {
+    private List<Request> requests;
+    public Requests() {
+    }
+    public Requests(List<Request> requests) {
+        this.requests = requests;
+    }
+    public List<Request> getRequests() {
+        return requests;
+    }
+    public void setRequests(List<Request> requests) {
+        this.requests = requests;
+    }
+    public void addRequests(Request r) {
+        requests.add(r);
+    }
+    public Request getRequest(int index) {
+        return requests.get(index);
+    }
+    public void clearRequest() {
+        requests.clear();
+    }
+    public void removeRequest(int index) {
+        requests.remove(index);
+    }
+    public int getRequestCount() {
+        return requests.size();
+    }
+//    @Override
+//    public boolean equals(Object other) {
+//        if (!(other instanceof Container)) return false;
+//        return components.equals(((Container)other).components);
+//    }
+}

                Ignore Space
               Show notes
              View
            
          
          22 ■■■■■
          app/src/main/java/com/example/cosmosclient/entities/UserJsonforRequests.java
      *
     */
 
    public String uId, uri, name, iconUri;
    public boolean login = true;
    //仕様ではStringを返すため
    //public Set<Token> tokens = new HashSet<>();
    //public Set<String> tokens = new HashSet<>();
    public String token;
    private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
 
    public UserJsonforRequests() {
 
    }
        setuId(uId);
        setUri(uri);
        setName(name);
        setIconUri(iconUri);
        setToken(this.dummyToken);
        //addToken(this.dummyToken);
        this.login = true;
    }
 
    public String getuId() {
        return uId;
    public void setIconUri(String iconUri) {
        this.iconUri = iconUri;
    }
 
    public boolean getLogin() {
        return login;
    }
 
    public void setLogin(boolean login) {
        this.login = login;
    }
 
    public void setToken(String token) {
        this.token = token;
    }
 
    public String getToken() {
        return token;
    }
 
    /*
     * //仕様ではStringで返すため
     * public Set<String> getTokens(){
     *     return tokens;
      *
      */
     public String uId, uri, name, iconUri;
-    public boolean login = true;
     //仕様ではStringを返すため
     //public Set<Token> tokens = new HashSet<>();
     //public Set<String> tokens = new HashSet<>();
-    public String token;
-    private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
     public UserJsonforRequests() {
     }
         setuId(uId);
         setUri(uri);
         setName(name);
         setIconUri(iconUri);
-        setToken(this.dummyToken);
-        //addToken(this.dummyToken);
-        this.login = true;
     }
     public String getuId() {
         return uId;
     public void setIconUri(String iconUri) {
         this.iconUri = iconUri;
     }
-    public boolean getLogin() {
-        return login;
-    }
-    public void setLogin(boolean login) {
-        this.login = login;
-    }
-    public void setToken(String token) {
-        this.token = token;
-    }
-    public String getToken() {
-        return token;
-    }
     /*
      * //仕様ではStringで返すため
      * public Set<String> getTokens(){
      *     return tokens;

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java

Show line notes below