T2 tonyfoti 2.11

[tonyfoti]

Issue #158 @sedramina @FatmaEmran @helali1993 @mohamed-halawa Please review.

[sedramina]

fix the search

[tonyfoti]

@mohamed-halawa This is not my part. Mine is the one of the filter search.

[tonyfoti]

@sedramina I have fixed the labels according to what you asked so please review again my last commit. But to be able to check it now, you should have the items inserted from the console to have full attributes because if you test from what you insert from the admin page so far in master the items will be missing attributes and you will have this error "undefined method `+' for nil:NilClass". So verify everything and tell me :)

[tonyfoti]

@FatmaEmran @helali1993 @mohamed-halawa Waiting for you reviews.

[tonyfoti]

@eldesouky Can you verify me too please since you have the correct database values for the items, and I also fixed your side bar location.

[mohamed-halawa]

OK code is verified

[sedramina]

no change in the labels

[tonyfoti]

@sedramina Check the last updated branch. You can see from the files changed that the branch now has the new labels. Pull my branch if you want instead of checkout but just have the most updated one.

[eldesouky]

@tonyfoti good job(Y) , but heads up on the boolean that chooses between all items and available items is not working

[tonyfoti]

@eldesouky Thanks for the review. The boolean of whether to choose available products only or all products checks for the items' status whether it is set to true or false; if you choose "available only" only the items with status set to true will be filtered else all the items in the database will be filtered. So try to insert some items with true status and some with false and check and tell me.

[sedramina]

i tried so many times to go to "GO SHOPPING " and it gives an error

[tonyfoti]

@sedramina Do the following:

rails console

Heathrecord.all.destroy Item.all.destroy

rails s

• sign in as a user create a heathrecord sign in as a retailer create an item

rails console

h = Healthrecord.all[0]

h.update_attributes(:fats => 200 , :acceptable_fat_per_week => 1000 , :acceptable_calcium_per_week => 1000 ,:acceptable_carbohydrate_per_week => 1000,:acceptable_protein_per_week => 1000 ,:acceptable_vitamin_a_per_week => 1000,:acceptable_vitamin_b_per_week => 1000,:acceptable_vitamin_c_per_week => 1000, :acceptable_vitamin_d_per_week => 1000, :acceptable_vitamin_e_per_week => 1000, :acceptable_vitamin_k_per_week => 1000,:protein_till_now => 0 , :carbohydrate_till_now => 0 , :calcium_till_now => 0 , :fat_till_now => 0 ,:vitamin_a_till_now => 0 ,:vitamin_b_till_now => 0 ,:vitamin_c_till_now => 0 ,:vitamin_d_till_now => 0 ,:vitamin_e_till_now => 0, :vitamin_k_till_now => 0)

b = Item.all[0]

b.update_attributes(:protein => 100, :carbohydrate => 100, :calcium => 100, :fat => 100, :vitamin_a => 200, :vitamin_b => 200, :vitamin_c => 200, :vitamin_d => 200, :vitamin_e => 200, :vitamin_k => 200)

rails s

Test the page and tell me :)

[sedramina]

I have tried this all @tonyfoti

[tonyfoti]

@sedramina Desouky tried it with his database values and it worked. So please just follow these steps again because the values on fb you tested had a wrong value (3 instead of 0) in this "b" b = Item.all[0] not Item.all[3] unless you inserted 4 items. So just retry the database insertion again it won't take time and update me with your review.

[sedramina]

I have tried this all @tonyfoti please check your code

[tonyfoti]

@sedramina The part you think is having an error in desouky's part and it is working fine with both of us(me and desouky) so if you want to only test my part just remove desouky's code in def members_items_index in items' controller. But if you insert correctly in the database following the correct instructions it should work. And @FatmaEmran what happened with you since you are a scenario reviewer?

[sedramina]

@tonyfoti so ill wait for inserting item to be merged to test your code

[tonyfoti]

@mostafa-adel Can you review my tests since I am the test reviewer of my component.

[FatmaEmran]

I Tried what Desouki did and the scenario of your story ran correctly on my pc, Your scenario is verified. @tonyfoti Wait for @sedramina to double check.

[ahmedhelalixyz]

Doc Verified @tonyfoti

[mostafa-adel]

test-verified :dancer:

[tonyfoti]

@sedramina Your are my last reviewer so please when you are done merge.

[sedramina]

verified however the layout is BAD

[andrewkhouzam]

@sedramina the layout is @AmrEmara Story Do not worry ;)

[sedramina]

@AmrEmara fix the layout asap please

[tonyfoti]

@sedramina If you are done merge me please.

[sedramina]

@tonyfoti well done