From 0b8ec2297682c3cf8583708766d0758ace5ad810 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 31 May 2017 13:42:44 +0630 Subject: [PATCH] deleted queue_items --- app/controllers/oqs/home_controller.rb | 7 +++++++ app/views/oqs/home/index.html.erb | 19 ++++++++++++++----- dump.rdb | Bin 485 -> 1669 bytes 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index acf99e41..07f12b93 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -1,5 +1,12 @@ class Oqs::HomeController < BaseOqsController def index + @queue_stations=OrderQueueStation.all + + # @queue_stations.each do |que| + # Contact.find(:all, :joins => ['left join sales s on s.customer_id = contacts.id'], :conditions => ["contact_type = 'Customer' AND name IS NOT NULL"],:group => ["contacts.id"]) + # AssignedOrderItem.find(:all, :conditions=>["order_queue_station_id=#{que.id}"], :group => ["order_queue_station_id"]) + # # AssignedOrderItem.where("order_queue_station_id = :que_id", {:que_id => que_id}).get + # end end def show end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 35815331..1f449cbc 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -4,18 +4,27 @@ @@ -67,7 +76,7 @@ -
+
diff --git a/dump.rdb b/dump.rdb index 96c96478436694a7da4fdb143daf16a6e2e802f7..b931754d4d0d6c1b83a8ccc4d623c8f56f2121e8 100644 GIT binary patch literal 1669 zcmY*a-*4Mj6~DIQ{7%-isMCtJd}C)>qvU$`_YV&=yWJG6h;7h^g4opDpTWb4Q`;Fu zm7$X=-uNLJZ-bCH)3zdQ(j;CGkI{HQyZ}}IfqZd^Kvd!dAylLcx7!1Iy7%1k<8wYo z=bZcX=bwAwB0@;sA8Q6*Yr)q;GfzvTr0hY-QZH&$QEUEVP3hxx|TX0z64*4p1IlsC5O_0=B? zZLNomcICzt(XTES!qwom+O@_;GBbjf3-yLG^~$+i*eG<8CvwfuZYE#KwVPWZxw-n& zN39_?A{;OaPGU`s&`~00k{ge^W-#sGFPnCujF}dgNv3p3Ga{H`NgZsg-a4F2hLt9r zdb81Z!$OeISneSsK|{?fhb(G}FxEMv ziJLpK`k(Zb-dIr9+rYgt$y?)!BI%u^!SUoqdZIUk6qPtV)f+)tQrLCICPB`fNSC@m6;JmU`DwzDMidjz5H=1=9E3N4 zJojWe(H%po#5l!L$fVw%;MbEpVYqYLt!{(2)0OSNO#I7~?mqFS0mVLGvzRbqtrt)^ zm2v0 zdq+F9Ngfe(l5?mCB}IBt8)zc65KC`GaFO76_vt?X*S2|-mc#K`};fNDj;ElVbJ2meZZ3Z5L6uTx!qA6aa597 z_K&BZN#SnRMLB=xgtRg^jJ!oLsK})L+jRbo&RLaV^zPK{{Un3MSDvZu9PO-)Y374= zL_u2o=h9OE&2@7DQMmZX2o6j$6UDiY`b!k>LHc>mWU#vM*Syy*M7K0K#Id6K-t_Gp z!J;((5s<~p>2&vc0(9|*x7Paa5Bemc7hlOos69pVcYs*Dl`*o&$C0JjMJpoq^Dm~R zx8O!(j2s7pi(ek4%o^tjx0M@5<7?*oS)s_%v+2p+;KG((eV5h$v>7}9)dnH zy8QcLiJ(S`6w9N*C>EqgwEA#5Sbv#kr4}fcH`r2YlN|bYo@418E1XHky7TXhijrVL zV5QQ@?jcBkc}Hrcdok1b1e|WQO}iXTtsZ=tAS~ekgP;QdCjL(| r5FdLeZhpFhK5v_V>CY<(SP)Js)Ck*2#YdH^HCADemS%W;6xt<9Aq%5e#d1 zDgoD~t3QjYrerZH`78RUB z7WJ`DS{i=IkNrJ7z5q&s)uk>w>>l(u%Q=&MyszPehA=9qHHF2H$>8H)?lL&5zX^uV nl&}!}5-A~2IX^b%I=15(UfXIC2i0CZp+t{Ycb_kkUxURbn6RK=