This commit is contained in:
2014-05-14 12:12:26 +02:00
parent 772b647406
commit 055a1071db
12 changed files with 48 additions and 46 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

After

Width:  |  Height:  |  Size: 346 B

+7 -16
View File
@@ -351,16 +351,6 @@
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3891"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
</defs>
<sodipodi:namedview
id="base"
@@ -370,8 +360,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.6911765"
inkscape:cx="50.233542"
inkscape:cy="82.053291"
inkscape:cx="12.503135"
inkscape:cy="73.526645"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -379,7 +369,7 @@
inkscape:window-height="856"
inkscape:window-x="4"
inkscape:window-y="0"
inkscape:window-maximized="0">
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2994"
@@ -410,10 +400,11 @@
transform="translate(-0.85266458,-1.9184948)"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/order-check.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473">
inkscape:export-ydpi="24.829473"
style="fill:#000000;fill-opacity:1">
<path
transform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
style="opacity:0.65158374;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
style="opacity:0.65158373999999997;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
d="m 20,42.362183 10,10 30,-30 10,10 -40,40 -20,-20 z"
id="path3881"
inkscape:connector-curvature="0"
@@ -423,7 +414,7 @@
inkscape:connector-curvature="0"
id="path2996"
d="M 23.490157,949.67748 33.981399,960.16872 65.455125,928.695 75.946367,939.18624 33.981399,981.15121 12.998915,960.16872 z"
style="fill:url(#linearGradient3891);fill-opacity:1;stroke:none" />
style="fill:#000000;fill-opacity:1;stroke:none" />
</g>
<path
sodipodi:type="inkscape:offset"

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 499 B

@@ -1,8 +1,9 @@
Qsupplier.App.ListsIndexController = Ember.ArrayController.extend
loading: true
dateChanged: (->
if @get('date')
@set('model', @store.find('list', date: @get('date')))
else
@set('model', @store.find('list'))
@set 'loading', true
lists = if @get('date') then @store.find('list', date: @get('date')) else @store.find('list')
lists.then => @set('loading', false)
@set 'model', lists
).observes('date')
lists: (-> @get('model')).property('model')
@@ -2,22 +2,22 @@ td.status-icons
span.active-order.fa.fa-check.fa-lg
td {{view.content.display}}
td.numeric.table_number
view Qsupplier.App.ActiveOrderTableNumberView contextBinding=view.content
view Qsupplier.App.ActiveOrderTableNumberView contextBinding="view.content"
td.section_title {{view.content.section.title}}
td.currency {{currency view.content.total }}
td.actions
if view.content.placed
button.mark_order_active{ action markOrderActive view.content.id}
/button.mark_order_active{ action markOrderActive view.content.id}
span.fa.fa-check.fa-2x
span.button-text=t 'order.being_processed'
button.hide.mark-order-active{ action markOrderActive view.content.id}
/span.button-text=t 'order.being_processed'
/button.hide.mark-order-active{ action markOrderActive view.content.id}
span.button-icon
span.button-text=t 'order.being_processed'
button.mark_order_delivered{ action markOrderDelivered view.content.id}
/button.mark_order_delivered{ action markOrderDelivered view.content.id}
span.fa-shifted-stack
i.fa.fa-check.fa-2x
i.fa.fa-check.fa-2x
span.button-text= t 'order.being_served'
button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
i.fa.fa-check.fa-stack-2x
i.fa.fa-check.fa-stack-2x
/span.button-text= t 'order.being_served'
/button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
span.button-icon
span.button-text= t 'order.being_served'
@@ -25,4 +25,8 @@ if lists
td.timestamp=time list.created_at
else
.row
.panel=t 'list.none_found'
.panel
if loading
span.loading
else
=t 'list.none_found'
@@ -24,11 +24,13 @@ span.icon
background-image: image-url('icons/order-doublecheck.png')
.fa-shifted-stack
@extend .fa-stack
//.fa-shifted-stack
position: relative
display: inline-block
width: 2.5em
height: 2em
line-height: 2em
//line-height: 2em
vertical-align: middle
.fa
position: absolute
@@ -50,3 +50,8 @@ main.main-section
.hide, .hidden
display: none
span.loading
@extend .fa
@extend .fa-spinner
@extend .fa-lg
@extend .fa-spin
+1
View File
@@ -209,6 +209,7 @@ class List
#order.section_id = self.section_id
#order.save
#end
# user performs a client side refresh
broadcast_users 'list_changed_table', list_id: id #, from_table_id: from_table, to_table_id: to_table.id
broadcast_supplier supplier_id, 'list_changed_table', list: as_json, section_title: to_table.section.try(:title), from_table_id: from_table
end
+5
View File
@@ -35,3 +35,8 @@
/jQuery(function(){
/Qsupplier.load_list('#{@list.id}');
/})
.test-div
span.fa.fa-square-o.fa-2x
span.fa-stack
i.fa.fa-square-o.fa-stack-2x
i.fa.fa-twitter.fa-stack-1x