Merge pull request #60 from support-project/develop

Develop

Author: koda-masaru

document/database/web.a5er

@@ -47,6 +47,80 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Relation]
+Entity1=NOTIFICATIONS
+Entity2=USER_NOTIFICATIONS
+RelationType1=1
+RelationType2=3
+Fields1=NO
+Fields2=NO
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,2392,5426,4682,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=0
+Bar1=239
+Bar2=543
+Bar3=468
+TermPos1=R
+TermPos2=R
+
+[Relation]
+Entity1=USERS
+Entity2=USER_NOTIFICATIONS
+RelationType1=1
+RelationType2=3
+Fields1=USER_ID
+Fields2=USER_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",0,1870,5468,5221,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=0
+Bar1=187
+Bar2=547
+Bar3=522
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=USER_NOTIFICATIONS
+LName=ユーザへの通知
+Comment=
+TableOption=
+Page=MAIN
+Left=620
+Top=970
+Field="ユーザID","USER_ID","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
+Field="NO","NO","bigint","NOT NULL",1,"","",$FFFFFFFF,""
+Field="ステータス","STATUS","@INT",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20160524165509
+Position="MAIN",620,970
+
+[Entity]
+PName=NOTIFICATIONS
+LName=通知
+Comment=
+TableOption=
+Page=MAIN
+Left=700
+Top=1550
+Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
+Field="タイトル","TITLE","VARCHAR(256)",,,"","",$FFFFFFFF,""
+Field="メッセージ","CONTENT","text",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20160524165243
+Position="MAIN",700,1550
+
 [Relation]
 Entity1=USERS
 Entity2=READ_MARKS
@@ -56,15 +130,15 @@ Fields1=USER_ID
 Fields2=USER_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",1,6518,6322,3629,R,R
+Position="MAIN",1,6518,6322,3672,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20160401004409
 LineMode=1
 Bar1=652
 Bar2=632
-Bar3=363
+Bar3=367
 TermPos1=R
 TermPos2=R
 
@@ -77,15 +151,15 @@ Fields1=NO
 Fields2=NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",1,8353,7213,4311,R,R
+Position="MAIN",1,5822,3840,4370,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20160401004727
 LineMode=1
-Bar1=835
-Bar2=721
-Bar3=431
+Bar1=582
+Bar2=384
+Bar3=437
 TermPos1=R
 TermPos2=R
 
@@ -95,25 +169,25 @@ LName=既読
 Comment=
 TableOption=
 Page=MAIN
-Left=900
-Top=1000
+Left=1050
+Top=900
 Field="NO","NO","INTEGER","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザID","USER_ID","INTEGER","NOT NULL",1,"","",$FFFFFFFF,""
 Field="次回も表示する","SHOW_NEXT_TIME","@INT",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160401004708
-Position="MAIN",900,1000
+Position="MAIN",1050,900
 
 [Entity]
 PName=NOTICES
 LName=告知
 Comment=
 TableOption=
 Page=MAIN
-Left=650
-Top=1200
+Left=930
+Top=1140
 Field="NO","NO","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="タイトル","TITLE","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
 Field="メッセージ","MESSAGE","text",,,"","",$FFFFFFFF,""
@@ -123,7 +197,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160401003236
-Position="MAIN",650,1200
+Position="MAIN",930,1140
 
 [Relation]
 Entity1=SYSTEMS
@@ -342,15 +416,15 @@ Fields1=KEY
 Fields2=LOCALE_KEY
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",3,5172,3295,5877,R,R
+Position="MAIN",1,5172,3295,4967,R,R
 Dependence=0
 Caption=
 PName=
-ModifiedDateTime=20160401004345
-LineMode=3
+ModifiedDateTime=20160524164931
+LineMode=1
 Bar1=517
 Bar2=330
-Bar3=588
+Bar3=497
 TermPos1=R
 TermPos2=R
 
@@ -401,15 +475,15 @@ Fields1=KEY
 Fields2=LOCALE_KEY
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",1,5230,6535,3015,R,R
+Position="MAIN",1,5230,8222,500,R,R
 Dependence=0
 Caption=
 PName=
 ModifiedDateTime=20150331110144
 LineMode=1
 Bar1=523
-Bar2=654
-Bar3=302
+Bar2=822
+Bar3=50
 TermPos1=R
 TermPos2=R
 
@@ -419,8 +493,8 @@ LName=ロケール
 Comment=
 TableOption=
 Page=MAIN
-Left=600
-Top=800
+Left=100
+Top=910
 Field="キー","KEY","@VARCHAR(12)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="言語","LANGUAGE","@VARCHAR(4)","NOT NULL",,"","",$FFFFFFFF,""
 Field="国","COUNTRY","@VARCHAR(4)",,,"","",$FFFFFFFF,""
@@ -431,7 +505,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20160127222007
-Position="MAIN",600,800
+Position="MAIN",100,910
 
 [Entity]
 PName=PASSWORD_RESETS
@@ -455,8 +529,8 @@ LName=仮登録ユーザ
 Comment=
 TableOption=
 Page=MAIN
-Left=90
-Top=930
+Left=80
+Top=1160
 Field="仮発行ID","ID","@VARCHAR(256)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ユーザKEY","USER_KEY","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
 Field="ユーザ名","USER_NAME","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
@@ -468,7 +542,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150710034620
-Position="MAIN",90,930
+Position="MAIN",80,1160
 
 [Relation]
 Entity1=SYSTEMS
@@ -594,7 +668,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=90
-Top=1200
+Top=1420
 Field="MAIL_ID","MAIL_ID","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ステータス","STATUS","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="送信先","TO_ADDRESS","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,""
@@ -608,7 +682,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150104130634
-Position="MAIN",90,1200
+Position="MAIN",90,1420
 
 [Entity]
 PName=ACCESS_LOGS
@@ -617,7 +691,7 @@ Comment=
 TableOption=
 Page=MAIN
 Left=100
-Top=750
+Top=720
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="PATH","PATH","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
 Field="IP_ADDRESS","IP_ADDRESS","@VARCHAR(64)",,,"","",$FFFFFFFF,""
@@ -626,7 +700,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416232943
-Position="MAIN",100,750
+Position="MAIN",100,720
 
 [Entity]
 PName=SYSTEMS
@@ -952,13 +1026,13 @@ Fields1=FUNCTION_KEY
 Fields2=FUNCTION_KEY
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5000,5000,4660,R,R
+Position="MAIN",0,5000,5000,4710,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=500
 Bar2=500
-Bar3=466
+Bar3=471
 TermPos1=R
 TermPos2=R

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>web</artifactId>
-    <version>1.7.1</version>
+    <version>1.8.0</version>
     <packaging>jar</packaging>
 
     <name>web</name>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>common</artifactId>
-            <version>1.7.0</version>
+            <version>1.8.0</version>
         </dependency>
 
         <dependency>

src/main/java/org/support/project/web/bean/LabelValue.java

@@ -1,33 +1,51 @@
 package org.support.project.web.bean;
 
 public class LabelValue {
-	/** 表示する値 */
-	private String label;
-	/** 実際の値 */
-	private String value;
-	/**
-	 * @return the label
-	 */
-	public String getLabel() {
-		return label;
-	}
-	/**
-	 * @param label the label to set
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-	/**
-	 * @param value the value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-	
+    /** 表示する値 */
+    private String label;
+    /** 実際の値 */
+    private String value;
+    
+    /**
+     * コンストラクタ
+     */
+    public LabelValue() {
+        super();
+    }
+    /**
+     * コンストラクタ
+     * @param label label
+     * @param value value
+     */
+    public LabelValue(String label, String value) {
+        super();
+        this.label = label;
+        this.value = value;
+    }
+    
+    /**
+     * @return the label
+     */
+    public String getLabel() {
+        return label;
+    }
+    /**
+     * @param label the label to set
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+    /**
+     * @return the value
+     */
+    public String getValue() {
+        return value;
+    }
+    /**
+     * @param value the value to set
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+    
 }