moved over commit 204ecdc from dev branch

Author: sumanchakrabarti

OfficeDevPnP.Core/OfficeDevPnP.Core/Utilities/Caml.cs

@@ -31,10 +31,7 @@ public static string FieldValue(string fieldName, string fieldValueType, string
             return string.Format(FIELD_VALUE, fieldName, fieldValueType, value);
         }
 
-        public static string OrderBy(params OrderByField[] fieldNames) {
-            return OrderBy(true, fieldNames);
-        }
-        public static string OrderBy(bool ascending, params OrderByField[] fieldRefs) {
+        public static string OrderBy(params OrderByField[] fieldRefs) {
             var sb = new StringBuilder();
             foreach (var field in fieldRefs){
                 sb.Append(field.ToString());

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePoint/CorporateEvents.SharePoint.csproj

@@ -50,6 +50,9 @@
     <Content Include="AppIcon.png">
       <OpcRelationship>manifest-icon</OpcRelationship>
     </Content>
+    <Content Include="Events\Elements.xml">
+      <OpcRelationship>feature-elementmanifest</OpcRelationship>
+    </Content>
     <Content Include="Featured Events\Elements.xml">
       <OpcRelationship>feature-elementmanifest</OpcRelationship>
     </Content>
@@ -72,6 +75,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="Events\SharePointProjectItem.spdata">
+      <SharePointProjectItemId>{2cd62ea9-61bf-4ff3-a5cd-952ec5ba284a}</SharePointProjectItemId>
+    </None>
     <None Include="Featured Events\SharePointProjectItem.spdata">
       <SharePointProjectItemId>{ee8bdffd-d79a-44b8-8b07-32f7d1eb673b}</SharePointProjectItemId>
     </None>

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePoint/Events/Elements.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Elements xmlns="http://schemas.microsoft.com/sharepoint/">
+  <ClientWebPart Name="Events" Title="Events" Description="Events displayed by specific category" DefaultWidth="700" DefaultHeight="300">
+
+    <!-- Content element identifies the location of the page that will render inside the client web part
+         Properties are referenced on the query string using the pattern _propertyName_
+         Example: Src="~appWebUrl/Pages/ClientWebPart1.aspx?Property1=_property1_" -->
+    <Content Type="html" Src="~remoteAppUrl/Events?{StandardTokens}" />
+
+    <!-- Define properties in the Properties element.
+         Remember to put Property Name on the Src attribute of the Content element above. -->
+    <Properties>
+      <Property Name="Category" DefaultValue="General" WebDisplayName="Category" Type="string" RequiresDesignerPermission="true" />
+    </Properties>
+
+  </ClientWebPart>
+</Elements>

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePoint/Events/SharePointProjectItem.spdata

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectItem Type="Microsoft.VisualStudio.SharePoint.ClientWebPart" DefaultFile="Elements.xml" SupportedTrustLevels="All" SupportedDeploymentScopes="AppPackage" xmlns="http://schemas.microsoft.com/VisualStudio/2010/SharePointTools/SharePointProjectItemModel">
+  <Files>
+    <ProjectItemFile Source="Elements.xml" Type="AppPackage" />
+  </Files>
+</ProjectItem>

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePointWeb/Content/Site.css

@@ -15,3 +15,30 @@ select,
 textarea {
     max-width: 280px;
 }
+
+/* Styles for events */
+.event { display: table; }
+.event-row { display: table-row; }
+.event-column1, .event-column2 { display: table-cell; padding: 10px; }
+.event-date {
+    border: 1px solid #0072c6;
+    font-weight: bold;
+    text-align: center;
+    width: 80px;
+}
+.event-month {
+    background-color: #0072c6;
+    color: #fff;
+    text-transform: uppercase;
+}
+.event-day {
+    font-size: 20px;
+    font-weight: normal;
+}
+.event-details-title {
+    font-weight: bold;
+    text-transform: uppercase;
+}
+.event-details-location {
+    font-style: italic;
+}

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePointWeb/Controllers/EventsController.cs

@@ -11,14 +11,27 @@ namespace CorporateEvents.SharePointWeb.Controllers {
     public class EventsController : Controller {
         #region [ Index ]
         [SharePointContextFilter]
-        public ActionResult Index(int offset = 0) {
+        public ActionResult Index(string category = "") {
+            var spContext = SharePointContextProvider.Current.GetSharePointContext(HttpContext);
+
             using (var clientContext = HttpContext.GetUserClientContextForSPHost()) {
+                ViewBag.SPHostUrl = spContext.SPHostUrl;
+                ViewBag.Category = category;
+
                 var list = clientContext.Web.GetListByTitle(ListDetails.EventsListName);
+                var categoryQuery = string.Empty;
+                if (!string.IsNullOrEmpty(category)) {
+                    categoryQuery = CAML.Where(CAML.Eq(CAML.FieldValue(Event.FIELD_CATEGORY, "Text", category)));
+                }
+                var orderByQuery = CAML.OrderBy(new OrderByField("Title"));
+
                 var caml = new CamlQuery() {
-                    ViewXml = CAML.ViewQuery()
+                    ViewXml = CAML.ViewQuery(categoryQuery, orderByQuery, rowLimit: 50)
                 };
                 var events = list.GetItems(caml);
+                clientContext.Load(events);
                 clientContext.ExecuteQuery();
+
                 var eventsList = events.Cast<ListItem>().Select(item => new Event(item)).ToList();
                 return View(eventsList);
             }
@@ -55,7 +68,7 @@ public ActionResult Item(int id) {
         /// <param name="maxCount">Maximum number of items to return.</param>
         /// <returns></returns>
         [SharePointContextFilter]
-        public ActionResult Featured(int maxCount = 5) {
+        public ActionResult Featured(int maxCount = 3) {
             using (var clientContext = HttpContext.GetUserClientContextForSPHost()) {
                 ViewBag.SPHostUrl = HttpContext.Request.QueryString["SPHostUrl"];
 
@@ -71,7 +84,8 @@ public ActionResult Featured(int maxCount = 5) {
                                 )
                             )
                         ),
-                        CAML.OrderBy(new OrderByField(Event.FIELD_DATE)))
+                        CAML.OrderBy(new OrderByField(Event.FIELD_DATE)),
+                        rowLimit: maxCount)
                 };
 
                 var list = clientContext.Web.Lists.GetByTitle(ListDetails.EventsListName);

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePointWeb/Controllers/HomeController.cs

@@ -44,11 +44,12 @@ public ActionResult Config(string status) {
         [HttpPost()]
         public ActionResult Config(System.Web.Mvc.FormCollection form) {
             var spContext = SharePointContextProvider.Current.GetSharePointContext(HttpContext);
+            var createDefaultData = true; //form["CreateDefaultData"].ToBoolean();
 
             string status;
             try {
                 var initializer = new DataInitializer(spContext);
-                initializer.Initialize();
+                initializer.Initialize(createDefaultData);
 
                 status = "Complete";
                 using (var clientContext = HttpContext.GetUserClientContextForSPHost()) {

Solutions/BusinessApps.CorporateEventsApp/CorporateEvents.SharePointWeb/CorporateEvents.SharePointWeb.csproj

@@ -163,6 +163,7 @@
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
     <Content Include="Content\Site.css" />
+    <Content Include="Images\ajax-loader.gif" />
     <Content Include="Images\company-events1.jpg" />
     <Content Include="Images\company-events2.jpg" />
     <Content Include="Images\company-events3.jpg" />
@@ -206,6 +207,7 @@
     <Content Include="Views\Registration\Index.cshtml" />
     <Content Include="Views\Events\Register.cshtml" />
     <Content Include="Scripts\jquery-2.1.1.min.map" />
+    <Content Include="Views\Events\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />