0.53.0

This solves #60
forCrowd · Jun 6, 2016 · 807d831 · 807d831
1 parent c19b3c9
commit 807d831
Show file tree

Hide file tree

Showing 41 changed files with 302 additions and 442 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 ### Changelog
 
+**0.53.0**
+* Navigate away confirmation in 'Unsaved changes' case
+https://github.com/forCrowd/WealthEconomy/issues/60
+ * isEditing property was removed
+ * ResourcePool.isTemp property was removed
+ * dataContext - _createEntitySuppressAuthValidation variable was removed
+ * UPO & Basics CMRPs were moved from client-side to server-side (again)
+* 'Register / login modal is not displayed when a new anonymous user interacts after logout' bug fix
+* Logo update
+* appSettings minor update
+
 **0.52.0**
 
 * Send an exception to server in 404 case

diff --git a/DataObjects/Migrations/DbMigrationsConfiguration.cs b/DataObjects/Migrations/DbMigrationsConfiguration.cs
@@ -112,6 +112,9 @@ static void CreateSampleUser(WealthEconomyContext context)
 
             // Sample resource pools
             var billionDollarQuestion = resourcePoolRepository.CreateBillionDollarQuestion(sampleUser);
+            var upoSample = resourcePoolRepository.CreateUPOSample(sampleUser);
+            var basicsExistingSystemSample = resourcePoolRepository.CreateBasicsExistingSystemSample(sampleUser);
+            var basicsNewSystemSample = resourcePoolRepository.CreateBasicsNewSystemSample(sampleUser);
             var priorityIndexSample = resourcePoolRepository.CreatePriorityIndexSample(sampleUser);
             var knowledgeIndexSample = resourcePoolRepository.CreateKnowledgeIndexSample(sampleUser);
             var knowledgeIndexPopularSoftwareLicenseSample = resourcePoolRepository.CreateKnowledgeIndexPopularSoftwareLicenseSample(sampleUser);
@@ -122,15 +125,21 @@ static void CreateSampleUser(WealthEconomyContext context)
             // Set Id fields explicitly, since strangely EF doesn't save them in the order that they've been added to ResourcePoolSet.
             // And they're referred with these Ids on front-end samples
             billionDollarQuestion.Id = 1;
-            priorityIndexSample.Id = 2;
-            knowledgeIndexSample.Id = 3;
-            knowledgeIndexPopularSoftwareLicenseSample.Id = 4;
-            totalCostIndexExistingSystemSample.Id = 5;
-            totalCostIndexNewSystemSample.Id = 6;
-            allInOneSample.Id = 7;
+            upoSample.Id = 2;
+            basicsExistingSystemSample.Id = 3;
+            basicsNewSystemSample.Id = 4;
+            priorityIndexSample.Id = 5;
+            knowledgeIndexSample.Id = 6;
+            knowledgeIndexPopularSoftwareLicenseSample.Id = 7;
+            totalCostIndexExistingSystemSample.Id = 8;
+            totalCostIndexNewSystemSample.Id = 9;
+            allInOneSample.Id = 10;
 
             // Insert
             resourcePoolRepository.Insert(billionDollarQuestion);
+            resourcePoolRepository.Insert(upoSample);
+            resourcePoolRepository.Insert(basicsExistingSystemSample);
+            resourcePoolRepository.Insert(basicsNewSystemSample);
             resourcePoolRepository.Insert(priorityIndexSample);
             resourcePoolRepository.Insert(knowledgeIndexSample);
             resourcePoolRepository.Insert(knowledgeIndexPopularSoftwareLicenseSample);

diff --git a/DataObjects/ResourcePoolRepository.cs b/DataObjects/ResourcePoolRepository.cs
@@ -43,6 +43,99 @@ public ResourcePool CreateBillionDollarQuestion(User user)
             return resourcePool;
         }
 
+        public ResourcePool CreateUPOSample(User user)
+        {
+            const int numberOfItems = 1;
+
+            // Resource pool
+            var resourcePool = CreateDefaultResourcePool(user: user,
+                resourcePoolName: "UPO",
+                useFixedResourcePoolRate: true,
+                mainElementName: "Organization",
+                addDirectIncomeField: true,
+                addMultiplierField: true,
+                addImportanceIndex: false,
+                numberOfItems: numberOfItems);
+
+            // Main element
+            var mainElement = resourcePool.ElementSet.First();
+            mainElement.DirectIncomeField.Name = "Sales Price"; // TODO It does not fit! Update this after having Initial Amount on RP!
+            mainElement.MultiplierField.Name = "Number of Sales";
+
+            // Items, cell, user cells
+            // TODO How about ToList()[0]?
+            mainElement.ElementItemSet.First().Name = "UPO";
+
+            // Return
+            return resourcePool;
+        }
+
+        public ResourcePool CreateBasicsExistingSystemSample(User user)
+        {
+            const int numberOfItems = 4;
+
+            // Resource pool
+            var resourcePool = CreateDefaultResourcePool(user: user,
+                resourcePoolName: "Basics - Existing Model",
+                useFixedResourcePoolRate: true,
+                mainElementName: "Organization",
+                addDirectIncomeField: true,
+                addMultiplierField: true,
+                addImportanceIndex: false,
+                numberOfItems: numberOfItems);
+
+            resourcePool.Key = "Basics Existing Model";
+
+            // Main element
+            var mainElement = resourcePool.ElementSet.First();
+            mainElement.DirectIncomeField.Name = "Sales Price";
+            mainElement.MultiplierField.Name = "Number of Sales";
+
+            // Items, cell, user cells
+            mainElement.ElementItemSet.Skip(0).First().Name = "Alpha";
+            mainElement.ElementItemSet.Skip(1).First().Name = "Beta";
+            mainElement.ElementItemSet.Skip(2).First().Name = "Charlie";
+            mainElement.ElementItemSet.Skip(3).First().Name = "Delta";
+
+            // Return
+            return resourcePool;
+        }
+
+        public ResourcePool CreateBasicsNewSystemSample(User user)
+        {
+            const int numberOfItems = 4;
+
+            // Resource pool
+            var resourcePool = CreateDefaultResourcePool(user: user,
+                resourcePoolName: "Basics - New Model",
+                useFixedResourcePoolRate: true,
+                mainElementName: "Organization",
+                addDirectIncomeField: true,
+                addMultiplierField: true,
+                addImportanceIndex: true,
+                numberOfItems: numberOfItems);
+
+            resourcePool.Key = "Basics New Model";
+
+            // Main element
+            var mainElement = resourcePool.ElementSet.First();
+
+            // Fields
+            mainElement.DirectIncomeField.Name = "Sales Price";
+            mainElement.MultiplierField.Name = "Number of Sales";
+
+            mainElement.ElementFieldSet.Single(item => item.IndexEnabled).Name = "Employee Satisfaction";
+
+            // Items, cell, user cells
+            mainElement.ElementItemSet.Skip(0).First().Name = "Alpha";
+            mainElement.ElementItemSet.Skip(1).First().Name = "Beta";
+            mainElement.ElementItemSet.Skip(2).First().Name = "Charlie";
+            mainElement.ElementItemSet.Skip(3).First().Name = "Delta";
+
+            // Return
+            return resourcePool;
+        }
+
         public ResourcePool CreatePriorityIndexSample(User user)
         {
             const int numberOfItems = 4;

diff --git a/Facade/EmailService.cs b/Facade/EmailService.cs
@@ -49,8 +49,11 @@ public async Task SendAsync(IdentityMessage message)
                 case EnvironmentType.Test:
                     {
                         // In local & test, always send to notification address
-                        if (hasNotificationAddress)
-                            mailMessage.To.Add(new MailAddress(AppSettings.NotificationEmailAddress));
+                        if (!hasNotificationAddress)
+                            return;
+
+                        mailMessage.To.Add(new MailAddress(AppSettings.NotificationEmailAddress));
+
                         break;
                     }
                 case EnvironmentType.Live:
@@ -72,8 +75,10 @@ public async Task SendAsync(IdentityMessage message)
                         else
                         {
                             // Login emails will only be send to notification address
-                            if (hasNotificationAddress)
-                                mailMessage.To.Add(new MailAddress(AppSettings.NotificationEmailAddress));
+                            if (!hasNotificationAddress)
+                                return;
+
+                            mailMessage.To.Add(new MailAddress(AppSettings.NotificationEmailAddress));
                         }
 
                         break;

diff --git a/SolutionItems/Documents/Content Notes.txt b/SolutionItems/Documents/Content Notes.txt
@@ -18,6 +18,8 @@ http://www.ted.com/talks/audrey_choi_how_to_make_a_profit_while_making_a_differe
 . Review google docs
 . Candy crush revenue
 . Non profit ironing (and many others) service
+. non profit example - http://john.onolan.org/what-it-means-to-be-non-profit/
+. junk food - http://www.brandsynario.com/12-awesome-junk-foods-their-shocking-calories-count/
 
 # Description
 Alt: Measuring the goodness

diff --git a/SolutionItems/Documents/Design.md b/SolutionItems/Documents/Design.md
@@ -1,29 +1,6 @@
-Agbs - Ali Tugrul
-[email protected]
-533 654 3834 http://www.agbsyazilim.com/Home/Index/#intro
+ng2 admin
+http://akveo.com/ng2-admin/
 
-Uğur Erbaş
-544 6850727
-[email protected]
+http://foundry.mediumra.re/variant/builder.html
 
-Şerif Ali Ünal - Kasım's
-553 979 0520
-[email protected]
-
-Sencer's?
-
----
-1. Çalıştığım projenin websitesinin tasarımı: https://wealth.forcrowd.org
-a. Genel tasarım, menü eklenmesi, iç sayfaların elden geçirilmesi (kullanıcı profili, kayıt olma, kullanıcı girişi vb. sayfalar)
-b. "ResourcePoolEditor": Sayfadaki başlıkların altında bulunan, organizasyon isimlerinin olduğu, kullanıcıların rating girebildiği kısım.
-Bunu daha user- friendly hale getirebilir miyiz vb. Örnek: https://wealth.forcrowd.org/sample/Billion-Dollar-Question
-c. Opsiyonel: Bazı bölümleri grafik ve/veya video ile anlatabilmeyi istiyorum, bu konuda da neler yapabiliriz diye bakabiliriz.
-
-2. Organizasyonun sitesinin tasarımı: http://www.forcrowd.org
-Kimiz, ne yapıyoruz, iletişim vb. bilgilerin bulunacağı ana site.
-Şuna benzer bir çalışma olabilir: http://osfund.co/
-
-3. Logo revizyon: Varolan logoya bir göz atıyor olabiliriz.
-
-. bootstrap
-. Süre, maliyet
+Gitter - ExhibitArts 19:47 If anyone needs a good logo for their non-profit project let me know.
diff --git a/SolutionItems/Documents/General Notes.txt b/SolutionItems/Documents/General Notes.txt
@@ -1,21 +1,3 @@
-tasarim
-ali tugrul 533 654 3834 http://www.agbsyazilim.com/Home/Index/#intro
-https://bionluk.com/liste/grafik-tasarim | http://foundry.mediumra.re/variant/builder.html
-logo + forcrowd.org + wealth general layout + menu + editor (ratings ui)
-http://osfund.co/
-
-alpha + gitter
-Gitter - ExhibitArts 19:47 If anyone needs a good logo for their non-profit project let me know.
-
-extend globalsign ssl + smarteraspnet static ip
-
----
-upforgrabs - first timer only
-https://github.com/formly-js/angular-formly/blob/master/CONTRIBUTING.md
-https://github.com/blog/1184-contributing-guidelines
-http://up-for-grabs.net/#/
-
----
-git rebase -i HEAD~3
+git rebase -i HEAD~3
 git push origin --force
 doesnt work with notepad++ ?
diff --git a/SolutionItems/Documents/Social.txt b/SolutionItems/Documents/Social.txt
@@ -3,20 +3,47 @@ gitter
 personal dev network https://www.facebook.com/lists/10151319136553665
 social network - Emin Pamucak
 freenode? stackoverflow?
+yourfirstpr (pull request)
 hackernews - https://news.ycombinator.com/
 reply to twitter 
 https://twitter.com/sethjuarez/status/692784256670498816
 https://twitter.com/martinwoodward/status/692832558447353857
 globalsign makale
 https://www.globalsign.com/en/blog/open-source-ssl-pinittome/?utm_source=twitter&utm_medium=social%20media&utm_campaign=blog
 https://opensource.com/how-submit-article
+https://opensource.com/participate?sc_cid=701600000011jJVAAY
+https://appear.in/
+
+upforgrabs - first timer only http://up-for-grabs.net/#/
+
+contributing
+https://github.com/formly-js/angular-formly/blob/master/CONTRIBUTING.md
+https://github.com/nayafia/contributing-template/blob/master/CONTRIBUTING-template.md
+https://github.com/blog/1184-contributing-guidelines
+http://www.defmacro.org/2013/04/03/issue-etiquette.html
+https://github.com/mdn/webextensions-examples/commit/ab55344cfca2334c40c89f08b01447f23a8ed467
+
+code of conduct
+http://contributor-covenant.org/
+http://www.ashedryden.com/blog/codes-of-conduct-101-faq
+
+My perfect README contains the following:
+    Project Title
+    Short description of project, including link to Code of Conduct
+    How to install the project
+    Link to tutorials and code examples
+    Frequently asked questions
+    Where to ask questions, i.e file an issue
+    Link to any issues that the project needs help on, like upcoming features.
+    How to get in touch with project maintainers, including more private communication
 
 ---
 https://www.patreon.com/
 https://gratipay.com/new
 https://www.braintreepayments.com/features/marketplace
 https://www.citizensbank.com/
 live broadcast? younow? haai? https://www.livecoding.tv/
+https://opencollective.com/yeoman
 
 ---
 grants
@@ -25,6 +52,8 @@ https://wiki.mozilla.org/MOSS
 http://www.numfocus.org/
 https://www.google.com.tr/search?q=eu+grants+open+source&ie=utf-8&oe=utf-8&gws_rd=cr&ei=f6X2Vt-iK-rB6AS8x7PwBQ
 https://stripe.com/blog/open-source-retreat-2016-grantees
+Mozilla Grant https://blog.mozilla.org/blog/2016/05/11/mozilla-open-source-support-moss-now-open-to-all-projects/
+https://jeremy.linuxquestions.org/2016/05/25/are-you-involved-with-an-open-source-project-thats-in-need-of-funding-i-may-be-able-to-help/
 
 ---
 Hello everyone!

diff --git a/SolutionItems/Documents/Todo.md b/SolutionItems/Documents/Todo.md
@@ -4,8 +4,6 @@
 Save failed!<br />Key 'New-CMRP' already exists Error: Conflict
 * field - rating edit in manage.html?
 * warmup script for live?!
-* content for forcrowd - story + team
-* content for wealth - articles
 * cmrp list? -> search page
 * content for editor? new content or new resourcepool - content in a content? or page as a new entity?
 * route update (_system/)
@@ -49,8 +47,6 @@ Currently direct income & multiplier field types can only be added once per elem
 seems nice, and it could be used in other cases.
 however it doesn't return the newly created entity to the caller, which probably is not suitable for most cases?
 how about using $injector.get('dataContext') in these cases, instead of broadcast?
- * try to use pure entities, instead of breeze versions? then demo resource pools wouldn't need isTemp?
-resourcePoolFactory.js - // Locally created CMRPs (isTemp) - TODO !
  * use createEntity in addX cases!
  * // TODO Most of these functions are related with userService.js - updateX functions
 // Try to merge these two - Actually try to handle these actions within the related entity / SH - 27 Nov. '15
@@ -141,7 +137,6 @@ With UserAware, should we also mention which actions are allowed?
 
 * ngClient - UI
  * my ratings / show all users' ratings should be applied each section separately (cmrp rate, field rating, element cell value)
- * Navigate away confirmation in isEditing
  * angular material - https://material.angularjs.org/latest/
  * blur admin https://github.com/akveo/blur-admin?utm_content=buffera7574&utm_medium=twitter&utm_source=changelog&utm_campaign=buffer
  * Better ratings UI https://angular-ui.github.io/bootstrap/#/getting_started

diff --git a/SolutionItems/Properties/AssemblyInfo.cs b/SolutionItems/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // AssemblyFileVersion is not in use for the moment
 //
-[assembly: AssemblyVersion("0.52.0")]
+[assembly: AssemblyVersion("0.53.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WebApi/Configs/Setup/appSettings.config b/WebApi/Configs/Setup/appSettings.config
@@ -11,7 +11,7 @@
     <!-- Determines whether SSL connection required for api & odata calls & email service -->
     <add key="EnableSsl" value="false" />
 
-    <!-- Registration emails will be send from this address -->
+    <!-- Registration emails will be send from this address (leave it blank in case you don't want to send registration emails) -->
     <add key="RegistrationEmailAddress" value="" />
 
     <!-- Notification emails will be send to this address (leave it blank in case you don't want to get notifications) -->

diff --git a/ngClient/_system/css/main.css b/ngClient/_system/css/main.css
@@ -1,4 +1,24 @@
-/* Brand styling - Probably css class names can be better, parent child structure? */
+body {
+    font-size: 15px;
+    padding-top: 50px;
+    padding-bottom: 20px;
+}
+
+/* Set width on the form input elements since they're 100% wide by default */
+input,
+select,
+textarea {
+    max-width: 280px;
+}
+
+.versionText {
+    border-top: 1px solid #333;
+    font-size: 90%;
+    margin-top: 20px;
+    padding: 20px 0;
+}
+
+/* Brand styling - Probably css class names can be better, parent child structure? */
 .brandLink,
 .brandLink > a,
 .brandLink > a:focus,
@@ -28,25 +48,12 @@
     font-size: 11px;
 }
 
-body {
-    font-size: 15px;
-    padding-top: 50px;
-    padding-bottom: 20px;
-}
-
 /* Set padding to keep content from hitting the edges */
 .body-content {
     padding-left: 15px;
     padding-right: 15px;
 }
 
-/* Set width on the form input elements since they're 100% wide by default */
-input,
-select,
-textarea {
-    max-width: 280px;
-}
-
 .bg-info {
     padding: 15px;
 }

diff --git a/ngClient/_system/images/forCrowd_Logo_189x40.jpg b/ngClient/_system/images/forCrowd_Logo_189x40.jpg
diff --git a/ngClient/_system/images/forCrowd_logo_34x34.jpg b/ngClient/_system/images/forCrowd_logo_34x34.jpg