Ui changes steph #112

superpowers11 · 2017-03-07T08:26:50Z

Here is the first round of UI changes.

I haven't touched the overlays for a signature, and I think swap components might look a little weird. But I have made a good number of changes in general, so I thought I would put this out in case you guys want to give feedback or merge stuff with master so that we can make sure the new code and functionality, which we are adding elsewhere, conforms to the new UI setup.

UPDATE:

This is a beta version, but I think it is good to merge. In fact, I think we should merge sooner rather than later, as it is getting more and more laborious to merge conflicts with master.
I did some changing of the messages displayed for signatures, depending on what's been signed. So take a look and see what you think. I found it a little confusing that a text input box (albeit a disabled one) was still being displayed after someone had already signed, and a submit button was still available, even though there was nothing to submit. Thus, I switched it so that instead they get a friendly message saying they've already signed. And their only option is a back button.

eanyanwu · 2017-03-07T08:27:46Z

I too, can get behind a gradual rolling out of ui changes.

eanyanwu · 2017-03-08T05:52:41Z

Oh boy new commits...trying them on now...

eanyanwu · 2017-03-10T00:15:32Z

I'm thinking I should just merge this.
So far, it is looking good (I did find a bug with the modal poping up when it shouldn, but that should be an easy fix).
By merging it, I can easily integrate it to the rest of my branches.
If that is ok by you peeps, I'll be merging it within the next two days.

superpowers11 · 2017-03-16T19:40:03Z

I just closed it, so that I can reopen it when it is actually ready. But if you want to merge what was there, feel free.

…ct-Phoenix

superpowers11 · 2017-03-19T01:00:54Z

I think this is good to go for now and should be merged. I am sure there is more improvement that can happen, but we should probably go ahead and merge it in.

eanyanwu · 2017-03-19T01:02:06Z

Do you want to resolve the conflicts or should I?

superpowers11 · 2017-03-19T06:56:23Z

Conflicts resolved! #conflictresolutionstrategies #growexperienceserve #reslife

eanyanwu · 2017-03-19T11:58:51Z

Is the search icon supposed to be outside the search box?

EDIT: Actually...we don't need a search button....since the search updates dynamically. Feel free to remove the button.?

eanyanwu

Wow, this look real good. Excited to have it be our new UI.
HOWEVER, there are few things that are currently broken. I tried to track them down to find the reason and I've commented as such below.
Checkout works pretty well as far as I’ve tested!
I haven't tested Swap Components yet since Input is not currently saving.

eanyanwu · 2017-03-19T12:04:06Z

Phoenix/Views/RciInput/Index.cshtml

@@ -1,8 +1,10 @@
 @model Phoenix.Models.Rci

 @{
-    ViewBag.Title = "Damage Input";
+    ViewBag.Title = "Damage Input: " + TempData["user"];


This doesn't work...think about when the RA is logged in and viewing someone else's RCI.
Solutions:

Pass the name of the user from the controller, using a view bag.

Use a view model :)

eanyanwu · 2017-03-19T12:19:13Z

Phoenix/Scripts/rci-input.js



 /* Add a div to the right component. This div will contain a :
    <p> element displaying a damage
    <input> hidden element that will be used when submitting the form
    */
 function addDamage(componentID) {
-    var pElement = "<p class='divAddOn-field new-damage'>" + $("#text-input-" + componentID).val() + "</p><i class='divAddOn-item material-icons' onclick='deleteNewDamages(event, this);'>delete</i>";
+    var pElement = "<p class=damage-element new-damage'>" + $("#text-input-" + componentID).val() + "</p><i class='material-icons' onclick='deleteNewDamages(event, this);'>close</i>";


You forgot a quote... consequence: damages don't save 🙅

eanyanwu · 2017-03-19T12:23:14Z

Phoenix/Views/RciCheckout/Index.cshtml

@@ -0,0 +1,45 @@
+@model Phoenix.Models.ViewModels.CheckoutRciViewModel


Why did you add an index view page to RciCheckout 0_) ?

eanyanwu · 2017-03-19T12:25:07Z

Phoenix/Views/RciCheckout/IndividualRoom.cshtml

+            <input class="divAddOn-item adding-fines" type="number" placeholder="2.00" id="fine-amount-input-@component.RciComponentID" />
+            <button class="divAddOn-item" onclick="addFine(@component.RciComponentID);" id="add-@component.RciComponentID">Add</button>
+        </div>
+        <div class="div-list" id="div-list-@component.RciComponentID">


I think when stuff was moved around, the id got renamed?
It's supposed to be fine-list-@component.RciComponentID
I use it as a hook to know where to insert new fines. Currently nothing happens when you click Add

eanyanwu · 2017-03-19T12:31:01Z

Phoenix/Views/RciCheckout/IndividualRoom.cshtml

-    </ul>
-}
-
-<div class="view" data="@Model.GordonID">


You should probably still have this <div> tag wrapping everything. It contain a data attribute which stores the person's ID which is used by rci-checkout.js.

eanyanwu · 2017-03-19T13:00:29Z

Phoenix/Views/RciInput/CheckinSigRA.cshtml


        <div>

-            @if (Model.GordonID == ViewBag.GordonID)


ViewBag.GordonID isn't set anywhere... this displays the wrong overlay when the RA is logged in.

eanyanwu · 2017-03-19T15:31:36Z

Steph said I could push directly to solve the issues outlined.
Don't be scared by the number of commits. They are all just one-liners.
I separated them so it will be clear what was done.
I'll continue testing this throughout the day and will merge once done.

eanyanwu

Second batch of reviews
EDIT: These have now been solved.

eanyanwu · 2017-03-19T19:33:08Z

Phoenix/Scripts/rci-input.js

+}
+
+function RASigSubmit() {
+    var rciSig = "";


Here. (This might be more of Rachel's error)
The RA never has three input fields to fill. Yet you get three values. This means that sometimes, depending on the situation, one or two of those values is going to be undefined. This isn't bad thing, except that it causes weird behavior in the SaveRASigs method in the RciInput Service when the RA is signing his own rci.
The gist of this comment is that we need to make sure than when the rci belongs to the RA, he signs both the CheckinSigRA and CheckinSigRes fields. Right now it doesn't do that :/

eanyanwu · 2017-03-19T20:02:15Z

Phoenix/Scripts/rci-input.js

+        }
+
+    });
+}


You forgot to include the check() method for RDs that queues an rci to be signed 🙅‍♂️

eanyanwu · 2017-03-19T20:39:08Z

The next commit is going to be simply styling tweaks, especially for mobile.

eanyanwu · 2017-03-19T21:44:13Z

Sweet, I think we good now.
Tweaks:

Fix the weird Add button issue on smalls screens
Separated the color of divAddOn-vert from its layout ( I use that same class in common area checkouts, and the color didn't fit :/)
divAddOn-vert and divAddOn-vert-field were flipped in some places

eanyanwu · 2017-03-19T21:46:07Z

Thanks Steph!
As I said in the previous comments, I hardly changed anything. It looks like I did a lot because I made commits for each thing I did just so you know what changed.
Merging now.

superpowers11 · 2017-03-19T21:58:45Z

Great!! Thanks for fixing it up Eze! I am glad you were able to find those issues. 👍🏻

…

On Sun, Mar 19, 2017 at 2:46 PM Eze Anyanwu ***@***.***> wrote: Merged #112 <#112>. — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <#112 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AOo5WrAJnbvasH4zq2n3GRyTNu__qyeUks5rnaIlgaJpZM4MVLSr> .

superpowers11 added 8 commits March 6, 2017 01:56

Start process to use Gordon brand and make more intuitive

61e475a

Fix RA Dashboard view

c9ed227

Fix login page appearance

8e9cb53

Add some role checks and improve header

d490b05

Be sensible with role checks

178dfb9

Clean up, clean up, everybody everywhere

ef2535c

Set logo check instead of pastDashboard check

cc30888

Remove all menus

e96578c

superpowers11 added 4 commits March 7, 2017 19:11

Change checkin sig to be overlay

7569808

Improve buttons

48e999a

Imrpove swap components view

93cea4c

Add user name to swap components

a9e0a82

Fixed the search bar.

0ccdb3b

superpowers11 closed this Mar 16, 2017

superpowers11 added 7 commits March 16, 2017 16:12

Remove hide/show damage

225ae78

Merge branch 'ui-changes-steph' of https://github.com/gordon-cs/Proje…

d1fc3e1

…ct-Phoenix

Improve checkout signature UI's

0626380

Merged master into branch

4323c89

Fix problems caused by merge

648d523

Show missing username

ab9165d

Fix iconography

8b055c2

superpowers11 reopened this Mar 19, 2017

superpowers11 added 2 commits March 19, 2017 02:35

Merge master into branch

67337b7

Miscellaneous sig fixes

c777b09

Add edit icon for clarity on dashboard

fc8bce1

eanyanwu reviewed Mar 19, 2017

View reviewed changes

eanyanwu added 7 commits March 19, 2017 11:14

Correct name is displayed at the top during checkin. -Eze

46579e8

Added missing quote that caused rcis not to save

269a303

Deleted index.cshtml

a9dd0ef

Re-added the wrapper div with the gordonID data

1bf6c4e

Tweak class name so that fines will be added properly

ef94faf

Define ViewBag.GordonID

1ae4d7e

Add a forgotten else clause

32e1500

eanyanwu added 5 commits March 19, 2017 15:09

Back to dashboard button actually takes you to dashboard.

4882ab9

Removed extttra divs

b45b3bf

Sign the RA column as well if the logged in RA is the owner of the rci.

522ec69

Include the check() method that was forgotten

bb57641

Clarify the namine of a method

3773056

eanyanwu reviewed Mar 19, 2017

View reviewed changes

eanyanwu added 2 commits March 19, 2017 17:37

Minor tweaks

ee7ee6e

More minor tweaks

a4bf3cc

eanyanwu merged commit afe43b9 into master Mar 19, 2017

superpowers11 mentioned this pull request Mar 20, 2017

Gordon Branding #108

Closed

eanyanwu deleted the ui-changes-steph branch April 1, 2017 01:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ui changes steph #112

Ui changes steph #112

superpowers11 commented Mar 7, 2017 •

edited

Loading

eanyanwu commented Mar 7, 2017

eanyanwu commented Mar 8, 2017

eanyanwu commented Mar 10, 2017

superpowers11 commented Mar 16, 2017

superpowers11 commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

superpowers11 commented Mar 19, 2017

eanyanwu commented Mar 19, 2017 •

edited

Loading

eanyanwu left a comment

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu commented Mar 19, 2017 •

edited

Loading

eanyanwu left a comment •

edited

Loading

eanyanwu Mar 19, 2017

eanyanwu Mar 19, 2017

eanyanwu commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

superpowers11 commented Mar 19, 2017 via email

		@@ -0,0 +1,45 @@
		@model Phoenix.Models.ViewModels.CheckoutRciViewModel

+                      }
+                  });
+              }

Ui changes steph #112

Ui changes steph #112

Conversation

superpowers11 commented Mar 7, 2017 • edited Loading

eanyanwu commented Mar 7, 2017

eanyanwu commented Mar 8, 2017

eanyanwu commented Mar 10, 2017

superpowers11 commented Mar 16, 2017

superpowers11 commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

superpowers11 commented Mar 19, 2017

eanyanwu commented Mar 19, 2017 • edited Loading

eanyanwu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eanyanwu commented Mar 19, 2017 • edited Loading

eanyanwu left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eanyanwu commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

eanyanwu commented Mar 19, 2017

superpowers11 commented Mar 19, 2017 via email

superpowers11 commented Mar 7, 2017 •

edited

Loading

eanyanwu commented Mar 19, 2017 •

edited

Loading

eanyanwu commented Mar 19, 2017 •

edited

Loading

eanyanwu left a comment •

edited

Loading