Finalisierung

OpenNTF · Jan 14, 2014 · 0dbdd5c · 0dbdd5c
1 parent c39f12e
commit 0dbdd5c
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 62 deletions.
diff --git a/...rap.simplecontacts.odp/Code/Java/biz/webgate/simplecontacts/api/ContactSessionFacade.java b/...rap.simplecontacts.odp/Code/Java/biz/webgate/simplecontacts/api/ContactSessionFacade.java
@@ -33,7 +33,13 @@ public class ContactSessionFacade {
 
 	// Contact API
 	public Contact createContact() {
-		return ContactStorageService.getInstance().createObject();
+		Contact conCurrent = ContactStorageService.getInstance().createObject();
+		try {
+			conCurrent.addObserver(ExtLibUtil.getCurrentSession().getEffectiveUserName());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return conCurrent;
 	}
 
 	public List<Contact> getAllContacts() {

diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/CustomControls/ccApplication.xsp b/org.openntf.xsp.bootstrap.simplecontacts.odp/CustomControls/ccApplication.xsp
@@ -17,7 +17,7 @@
 				navigationPath="#{javascript:compositeData.navigationPath}"
 				legalText="Webgate Consulting AG, Switzerland - 2014"
 				productLogoAlt="Bootstrap4XPages Demo" productLogoHeight=""
-				productLogo="/WebGateLogo.jpg">
+				productLogo="/simpleContacts.png">
 				<xe:this.footerLinks>
 					<xe:basicContainerNode label="Links:">
 						<xe:this.children>

diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/CustomControls/ccApplication.xsp.metadata b/org.openntf.xsp.bootstrap.simplecontacts.odp/CustomControls/ccApplication.xsp.metadata
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C5100313BE3" version="9.0" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1d6" sequence="9" unid="AF9409D6D347B949C1257C5100455DA5">
-<created><datetime>20131230T133739,57+01</datetime></created>
-<modified><datetime>20131230T133829,97+01</datetime></modified>
-<revised><datetime>20131230T133829,96+01</datetime></revised>
-<lastaccessed><datetime>20131230T133829,96+01</datetime></lastaccessed>
-<addedtofile><datetime>20131230T133739,57+01</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></updatedby>
-<wassignedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C51002881FF" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="20a" sequence="19" unid="18D2EA4679C3D9CFC1257C520024CA5A">
+<created><datetime>20131231T074150,98+01</datetime></created>
+<modified><datetime>20140114T091216,87+01</datetime></modified>
+<revised><datetime>20140114T091216,86+01</datetime></revised>
+<lastaccessed><datetime>20140114T091216,87+01</datetime></lastaccessed>
+<addedtofile><datetime>20131231T074151,32+01</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></updatedby>
+<wassignedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></wassignedby>
 <item name="$Flags"><text>gC~4;</text></item>
 <item name="$TITLE"><text>ccApplication.xsp</text></item>
 <item name="$DesignerVersion"><text>8.5</text></item>
@@ -15,8 +15,8 @@
 
 
 
+<item name="$FileNames" sign="true"><text>ccApplication.xsp</text></item>
 
 
-<item name="$FileNames" sign="true"><text>ccApplication.xsp</text></item>
 
 </note>
diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/Resources/Images/simpleContacts.png b/org.openntf.xsp.bootstrap.simplecontacts.odp/Resources/Images/simpleContacts.png
diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/Resources/Images/simpleContacts.png.metadata b/org.openntf.xsp.bootstrap.simplecontacts.odp/Resources/Images/simpleContacts.png.metadata
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C51002881FF" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="272" sequence="1" unid="0FD47623D9CB1B42C1257C60002D02D9">
+<created><datetime>20140114T091138,49+01</datetime></created>
+<modified><datetime>20140114T091138,55+01</datetime></modified>
+<revised><datetime>20140114T091138,54+01</datetime></revised>
+<lastaccessed><datetime>20140114T091138,55+01</datetime></lastaccessed>
+<addedtofile><datetime>20140114T091138,55+01</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></updatedby>
+<wassignedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></wassignedby>
+<item name="$TITLE"><text>simpleContacts.png</text></item>
+<item name="$Flags"><text>34CiQ</text></item>
+<item name="$FlagsExt"><text>D</text></item>
+<item name="$ImagesWide" sign="true"><number>1</number></item>
+<item name="$ImagesHigh" sign="true"><number>1</number></item>
+<item name="$ImagesColorize" sign="true"><number>0</number></item>
+
+
+<item name="$MimeType" sign="true"><text>image/png</text></item>
+<item name="$FileModDT" sign="true"><datetime>20140114T091048,00+01</datetime></item>
+<item name="$ImageNames" sign="true"><text>simpleContacts.png</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item></note>
diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/allContacts.xsp b/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/allContacts.xsp
@@ -2,7 +2,7 @@
 <xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
 	xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:xpt="http://www.openntf.org/xsp/xpt">
 	<xc:ccApplication navigationPath="allContacts"
-		pageTitle="Simple Contacts">
+		pageTitle="All Contacts">
 		<xp:this.facets>
 			<xp:panel xp:key="facetRight">
 				<xpt:oneuitps id="oneuitps1" title="Using DataView"
@@ -27,19 +27,20 @@ viewScope.showBtnCreateContact=false;}]]></xp:this.action>
 					pageName="Contact.xsp" rows="10">
 					<xp:this.facets>
 						<xp:panel xp:key="detail">
-						<xp:link escape="true" text="add to my contacts"
-							id="lnkAddWatchlist">
-							<xp:image id="image7"
-								url="#{javascript:@ViewIconUrl(182)}"
-								alt="add to my contacts watchlist"
-								title="add to my contacts watchlist">
-							</xp:image>
-							&#160;
-							<xp:eventHandler event="onclick"
-								submit="true" refreshMode="complete">
-								<xp:this.action><![CDATA[#{javascript:contactBean.addToObserve(contactRow.getBO());}]]></xp:this.action>
-							</xp:eventHandler></xp:link>
-						<xe:djTabContainer id="djTabContainer1"
+							<xp:link escape="true"
+								text="add to my contacts" id="lnkAddWatchlist">
+								<xp:image id="image7"
+									url="#{javascript:@ViewIconUrl(182)}"
+									alt="add to my contacts watchlist"
+									title="add to my contacts watchlist">
+								</xp:image>
+								&#160;
+								<xp:eventHandler event="onclick"
+									submit="true" refreshMode="complete">
+									<xp:this.action><![CDATA[#{javascript:contactBean.addToObserve(contactRow.getBO());}]]></xp:this.action>
+								</xp:eventHandler>
+							</xp:link>
+							<xe:djTabContainer id="djTabContainer1"
 								doLayout="false" style="width:100%">
 								<xe:this.selectedTab><![CDATA[#{javascript:viewScope.get(contactRow.ID +"_selTab")}]]></xe:this.selectedTab>
 								<xe:djTabPane id="djTabAddress"
@@ -465,11 +466,12 @@ dsOL.refresh();}]]></xp:this.action>
 					</xe:this.summaryColumn>
 				</xe:dataView>
 
-				<xe:dialog id="dlgAddress" title="Address information">
+				<xe:dialog id="dlgAddress"
+					title="Address information">
 					<xc:ccDialogAddAddress></xc:ccDialogAddAddress>
 				</xe:dialog>
 				<xe:dialog id="dlgPhone" title="Phone number">
-						<xc:ccDialogAddPhone></xc:ccDialogAddPhone>
+					<xc:ccDialogAddPhone></xc:ccDialogAddPhone>
 				</xe:dialog>
 				<xe:dialog id="dlgEmail" title="Email">
 					<xc:ccDialogAddEmail></xc:ccDialogAddEmail>

diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/allContacts.xsp.metadata b/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/allContacts.xsp.metadata
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C5100313BE3" version="9.0" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="1da" sequence="166" unid="1CDF2981B37A366AC1257C510045CA90">
-<created><datetime>20131230T134218,40+01</datetime></created>
-<modified><datetime>20140103T093628,58+01</datetime></modified>
-<revised><datetime>20140103T093628,57+01</datetime></revised>
-<lastaccessed><datetime>20140103T093628,57+01</datetime></lastaccessed>
-<addedtofile><datetime>20131230T134218,40+01</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></updatedby>
-<wassignedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C51002881FF" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1f2" sequence="94" unid="62DCDA8BEDF8835EC1257C520024CA50">
+<created><datetime>20131231T074150,88+01</datetime></created>
+<modified><datetime>20140114T091518,89+01</datetime></modified>
+<revised><datetime>20140114T091518,88+01</datetime></revised>
+<lastaccessed><datetime>20140114T091518,89+01</datetime></lastaccessed>
+<addedtofile><datetime>20131231T074150,94+01</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></updatedby>
+<wassignedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></wassignedby>
 <item name="$Flags"><text>gC~4K</text></item>
 <item name="$TITLE"><text>allContacts.xsp</text></item>
 <item name="$DesignerVersion"><text>8.5.1</text></item>
@@ -17,4 +17,6 @@
 
 <item name="$FileNames" sign="true"><text>allContacts.xsp</text></item>
 
+
+
 </note>
diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/myContacts.xsp b/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/myContacts.xsp
@@ -2,7 +2,7 @@
 <xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xc="http://www.ibm.com/xsp/custom"
 	xmlns:xpt="http://www.openntf.org/xsp/xpt">
 
-	<xc:ccApplication>
+	<xc:ccApplication pageTitle="My Contacts">
 		<xp:this.facets>
 			<xc:ccNav xp:key="facetLeft"></xc:ccNav>
 			<xp:panel xp:key="facetMiddle" id="panMyContacts">
@@ -17,26 +17,31 @@
 						<xp:td style="width:20px"></xp:td>
 						<xp:td style="width:20px"></xp:td>
 						<xp:td>
-							<xp:label value="Firstname" id="lblFirstname">
+							<xp:label value="Firstname"
+								id="lblFirstname">
 							</xp:label>
 						</xp:td>
 						<xp:td>
-							<xp:label value="Middlename" id="lblMiddlename">
+							<xp:label value="Middlename"
+								id="lblMiddlename">
 							</xp:label>
 						</xp:td>
 						<xp:td>
-							<xp:label value="Lastname" id="lblLastname">
+							<xp:label value="Lastname"
+								id="lblLastname">
 							</xp:label>
 						</xp:td>
 						<xp:td>
 							<xp:label value="Title" id="lblTitle"></xp:label>
 						</xp:td>
 						<xp:td>
-							<xp:label value="Salutation" id="lblSalutation">
+							<xp:label value="Salutation"
+								id="lblSalutation">
 							</xp:label>
 						</xp:td>
 						<xp:td>
-							<xp:label value="Birthday" id="lblBirthday">
+							<xp:label value="Birthday"
+								id="lblBirthday">
 							</xp:label>
 						</xp:td>
 					</xp:tr>
@@ -52,9 +57,10 @@
 
 
 									<xp:eventHandler event="onclick"
-										submit="true" refreshMode="partial" execMode="partial" execId="panMyContacts" refreshId="panMyContacts">
+										submit="true" refreshMode="partial" execMode="partial"
+										execId="panMyContacts" refreshId="panMyContacts">
 										<xp:this.action><![CDATA[#{javascript:contactBean.removeToObserve(contact.getBO());
-var dsMyContacts = getComponent("panMyContacts").getData();
+var dsMyContacts = xptBean.findDataSource("panMyContacts","myContacts");
 dsMyContacts.refresh();}]]></xp:this.action>
 									</xp:eventHandler>
 								</xp:image>
@@ -70,27 +76,33 @@ dsMyContacts.refresh();}]]></xp:this.action>
 								</xp:image>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="firstname" value="#{contact.firstName}">
+								<xp:text escape="true" id="firstname"
+									value="#{contact.firstName}">
 								</xp:text>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="computedField1" value="#{contact.middleName}">
+								<xp:text escape="true"
+									id="computedField1" value="#{contact.middleName}">
 								</xp:text>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="computedField2" value="#{contact.lastName}">
+								<xp:text escape="true"
+									id="computedField2" value="#{contact.lastName}">
 								</xp:text>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="computedField3" value="#{contact.title}">
+								<xp:text escape="true"
+									id="computedField3" value="#{contact.title}">
 								</xp:text>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="computedField4" value="#{contact.salutation}">
+								<xp:text escape="true"
+									id="computedField4" value="#{contact.salutation}">
 								</xp:text>
 							</xp:td>
 							<xp:td>
-								<xp:text escape="true" id="computedField5" value="#{contact.birthday}">
+								<xp:text escape="true"
+									id="computedField5" value="#{contact.birthday}">
 								</xp:text>
 							</xp:td>
 

diff --git a/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/myContacts.xsp.metadata b/org.openntf.xsp.bootstrap.simplecontacts.odp/XPages/myContacts.xsp.metadata
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C5100313BE3" version="9.0" xmlns="http://www.lotus.com/dxl">
-<noteinfo noteid="2ae" sequence="86" unid="1912151CA1F01E00C1257C5C004F4156">
-<created><datetime>20140110T152540,70+01</datetime></created>
-<modified><datetime>20140111T125640,82+01</datetime></modified>
-<revised><datetime>20140111T125640,81+01</datetime></revised>
-<lastaccessed><datetime>20140111T125640,81+01</datetime></lastaccessed>
-<addedtofile><datetime>20140110T152540,70+01</datetime></addedtofile></noteinfo>
-<updatedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></updatedby>
-<wassignedby><name>CN=Barbara Hegnauer/O=WGC/C=CH</name></wassignedby>
+<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="C1257C51002881FF" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="26e" sequence="16" unid="C93B2BFD5D51D582C1257C60002A792B">
+<created><datetime>20140114T084355,31+01</datetime></created>
+<modified><datetime>20140114T091518,80+01</datetime></modified>
+<revised><datetime>20140114T091518,79+01</datetime></revised>
+<lastaccessed><datetime>20140114T091518,80+01</datetime></lastaccessed>
+<addedtofile><datetime>20140114T084355,32+01</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></updatedby>
+<wassignedby><name>CN=Christian Guedemann/O=WGC/C=CH</name></wassignedby>
 <item name="$Flags"><text>gC~4K</text></item>
 <item name="$TITLE"><text>myContacts.xsp</text></item>
 
-<item name="$DesignerVersion"><text>8.5.1</text></item>
 
 
+<item name="$FileNames" sign="true"><text>myContacts.xsp</text></item>
+<item name="$DesignerVersion"><text>8.5.1</text></item>
 
 
-<item name="$FileNames" sign="true"><text>myContacts.xsp</text></item>
 
 </note>