From 8613b355c58ac0da200dbdd3baee376979a1c998 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 2 Dec 2020 14:45:50 +0100 Subject: [PATCH 001/561] add intro template --- lib/powerpoint.rb | 1 + lib/powerpoint/presentation.rb | 10 +++ lib/powerpoint/slide/hub_intro.rb | 36 +++++++++ lib/powerpoint/views/hub_intro_slide.xml.erb | 74 +++++++++++++++++++ samples/pptx/sample.pptx | Bin 1500269 -> 1500323 bytes spec/hub_test_spec.rb | 13 ++++ 6 files changed, 134 insertions(+) create mode 100644 lib/powerpoint/slide/hub_intro.rb create mode 100644 lib/powerpoint/views/hub_intro_slide.xml.erb create mode 100644 spec/hub_test_spec.rb diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 71fb5f68..7e0824d2 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -1,6 +1,7 @@ require "powerpoint/version" require 'powerpoint/util' require 'powerpoint/slide/intro' +require 'powerpoint/slide/hub_intro' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' require 'powerpoint/slide/text_picture_split' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index c8a75d98..69c7bce5 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -38,6 +38,16 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end + def add_hub_intro(title, subtitile = nil) + existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::HubIntro}[0] + slide = Powerpoint::Slide::HubIntro.new(presentation: self, title: title, subtitile: subtitile) + if existing_intro_slide + @slides[@slides.index(existing_intro_slide)] = slide + else + @slides.insert 0, slide + end + end + def save(path) Dir.mktmpdir do |dir| extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}" diff --git a/lib/powerpoint/slide/hub_intro.rb b/lib/powerpoint/slide/hub_intro.rb new file mode 100644 index 00000000..a6c69cb7 --- /dev/null +++ b/lib/powerpoint/slide/hub_intro.rb @@ -0,0 +1,36 @@ +require 'fileutils' +require 'erb' + +module Powerpoint + module Slide + class HubIntro + include Powerpoint::Util + + attr_reader :title, :subtitile + + def initialize(options={}) + require_arguments [:title, :subtitile], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + end + + def save(extract_path, index) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + nil + end + + def save_rel_xml(extract_path, index) + render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('hub_intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/hub_intro_slide.xml.erb b/lib/powerpoint/views/hub_intro_slide.xml.erb new file mode 100644 index 00000000..c715d122 --- /dev/null +++ b/lib/powerpoint/views/hub_intro_slide.xml.erb @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + <%= subtitile %> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index 1221afc4ec6600227620ee82b39695566f3e4b56..c9c1e7b6bf9f90a369ef56b1920a3b160a4ac89b 100644 GIT binary patch delta 5802 zcmai23tY`-AOD|Do$7SI{klr0EAhMxzSZw8#zoz2&_c#}3iAy`V8aBGG^RUKf%hd8hk z76|^11D)LoL-u^l?YYGg0rkN6*6dnWwKaE;N+XPfuFXBCQ0^sJ>20;X2t{JKC?DMKc_e= z4bnKpF{@y^P$lp|i@?!Jvx006(cDGg%)^glOW-w&8Ob8x9n`l7u5y1yD;Z0bUy;hM zD8*NKILMU-6sBTSxZ}~oFs0GO@Y+JzZUh%zwz#a_tzcu$&peV}gr>3l=25hD)Ea3# zzvoVG&`T0T@U;xFGcr3=i|>tqQ4F`j!wP9^Tr_`h@{+6?TxqRW90lCJ(#52QNgorDGr(ks$q17%CKF7in9MMlW3s?xDGL-^%~=<&nKDHr z6x}~ZLUtSyH9MyKWXTLqz-F$;BFZ6&`<#6osn-p_|g&XM0v6sF~x+8>`B zZgfBXg;UAGp+$Cu^9OPd8MyU_ewOPXMS1z~t{%ZO{L^_k#Fn?#Emb3-T8~wP!j>)j znmV*A02?IEhjQ1Bd+)dPPRot>xaL)P|IG)23)bofgw)_xN(IW#0nemkPR@rTXPSC{ zy{RfQzGF%Dm+_XbUOZS>omvyUtgC*&6^Q*m5WwixG^iZ)#*@g^`f)gmU&ryF=OV;Up+VD&k^SBt+rmG zrw+A!gTHtXA0$2X$NtWZ8mC;k*Vf?`xKdLD3?o5;0Z%FZ@X&xT)!`A0N^qq{+j`u`2aW}Qa&hp+x*#8;_v z?|WHCkNWxqvd@QMCg{lbE_x+4WB#!8yYQaj5hOhbqhe27-7mN>cdJooPI20r^3P4J zM_Vi~nm6+KwU+T*NyBe?p@1Yazq=0&rw&apu>9HN-Q|k4dXNW= z?1mgR#r-r}UUaDi_xFz?C@d@6QH9qHtpE8KN z@P4S%mFy+CPbPTpuS+yZ8K3ygj9&_)ho*&8dfkbuir92!eTHxHhSsJ&2NVBO{c$t* zN;2Kiq(ZZVjH4lD4Hi@8briK9EsLFAY2Irvsw8yA*>$uq!L0o8wHr|j=RTCbI@>X*tSLWLB?g@F^6F&`qG!iCqg|}8c+KA~`8=_4b>^5q zuh)L{>A98Jkt-a>ZWO5Z0hGNwY67hZ!na>A zi4#0rjNAvGl1u+h6RKO-oh1#EQ6l08is6xRX{oGXGs zacfYmgxu$;8G~N6D+Ry(Cfz9+XS2i?Z`KkI_u_gocW1CRnBhgBh)&QkFcIQ$d3}-;i;9QByI0 z#GW-jG>H_(KdEzSCN^o0%dMJ(vgB@D0g}~EilvL8KPrFK2&|meQE|V=sR2?E}yynW6==YTto2yI1_2Si1o7M-v^-s@i2JY*f)VH z2zwaE;CM=LUr1Obg<6D!s5zo1KY^JO34eD>ao9#Ix(f%ZE}HF1Mbq2Bj84q2ZS2H^ zj--rH?VJs1?;6=;Y~z0pnl`M*uqZ9x1QP9RXU**xN6po?g9+CeUd3$*1vu<#oE&vf zwuivs%X+wO^Lt)SKh2Ox^y=dfJ)1#&E#UZnM_~^ZBu@-9{W^%b zcNP-dWXHLV@?210D*!E#g5$?(xu9FuH97tq=O|BS4#!!1OH(I+<7D5|dRa-1LHL4>~TQuGi9us)Du_ubGiSs%o5Jh_&m*6M>f@o_i6S}oFsc^tBj!T}KO74Vdpdvc0yU7%4ZV~o=+_`jbBn? z6o4n1m1mz(Z?wPQDwW5tEAij3~s(NfadwKvXMqvc1!&#PGq116B|FhCmRCT7uxRF0;)#N_c8Wi40 T-|4VWf*HJ(;|Y6?c?|Ox#eJ8y delta 5499 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 Date: Thu, 3 Dec 2020 10:17:41 +0100 Subject: [PATCH 002/561] extended replaces hub to make more generic --- lib/powerpoint.rb | 2 +- lib/powerpoint/presentation.rb | 6 +- .../slide/{hub_intro.rb => extended_intro.rb} | 4 +- ...e.xml.erb => extended_intro_slide.xml.erb} | 0 samples/pptx/sample.pptx | Bin 1500323 -> 1502092 bytes ...hub_test_spec.rb => extended_test_spec.rb} | 2 +- template/ppt/theme/theme2.xml | 281 ++++++++++++++++++ 7 files changed, 288 insertions(+), 7 deletions(-) rename lib/powerpoint/slide/{hub_intro.rb => extended_intro.rb} (83%) rename lib/powerpoint/views/{hub_intro_slide.xml.erb => extended_intro_slide.xml.erb} (100%) rename spec/{hub_test_spec.rb => extended_test_spec.rb} (76%) create mode 100644 template/ppt/theme/theme2.xml diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 7e0824d2..ddcc5bd5 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -1,7 +1,7 @@ require "powerpoint/version" require 'powerpoint/util' require 'powerpoint/slide/intro' -require 'powerpoint/slide/hub_intro' +require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' require 'powerpoint/slide/text_picture_split' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 69c7bce5..cefbae23 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -38,9 +38,9 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_hub_intro(title, subtitile = nil) - existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::HubIntro}[0] - slide = Powerpoint::Slide::HubIntro.new(presentation: self, title: title, subtitile: subtitile) + def add_extended_intro(title, subtitile = nil) + existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitile: subtitile) if existing_intro_slide @slides[@slides.index(existing_intro_slide)] = slide else diff --git a/lib/powerpoint/slide/hub_intro.rb b/lib/powerpoint/slide/extended_intro.rb similarity index 83% rename from lib/powerpoint/slide/hub_intro.rb rename to lib/powerpoint/slide/extended_intro.rb index a6c69cb7..aa53a282 100644 --- a/lib/powerpoint/slide/hub_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -3,7 +3,7 @@ module Powerpoint module Slide - class HubIntro + class ExtendedIntro include Powerpoint::Util attr_reader :title, :subtitile @@ -28,7 +28,7 @@ def save_rel_xml(extract_path, index) private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('hub_intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('extended_intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end diff --git a/lib/powerpoint/views/hub_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb similarity index 100% rename from lib/powerpoint/views/hub_intro_slide.xml.erb rename to lib/powerpoint/views/extended_intro_slide.xml.erb diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index c9c1e7b6bf9f90a369ef56b1920a3b160a4ac89b..17cf4b83ef79d54fdf62f79099a0e2b62b713266 100644 GIT binary patch delta 4804 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 delta 3464 zcmb7G3s96*6u!F)3-Xd(;DBrf3reQ8z(k^kDLpMr*c2*|j3z1@OcSYQYLeAT%PjRT zuSPlcn4!{`bQxADO_WpwG(%7jMGz85E3=x+sLnn2U-mUq)6Sgv&z|RZ?mhS1`}&E3 z4;u$NEAY znXWB}Qbq?EN!T9V=TE{qxSj+T!9fA}n};A)xyBr*G{l6E=48z70KshdR#nu-hmmVz zd>R>O&3O`wEnj$sDWBw%f&Hz7JyMZ7CQ(?**lT74D({VvvA2yWB5d~XaT$ITEPLWk z$poeDkp(s0xYREUy{%8y4E-4H$JlEIWo=f1ebMANX}K<=O9m;Ou~9N%w+~9+t9P!H zHZNzbAr%#ooDFILu?nK$i@HFsEY2oKitWK0l^xlK$$t2`gK9{n* zODN|ID|rVA=1M{N18Isq*Jb_YS+w4rH*Brg@0ZH*2mVsS56N%-B>L9ox6pTO!FA$m zuPsq5o8F8z7plk2pM8F^g|MDvtB@ONygf(qI~NBVYfNbZsy z_DjxD1F|_B&+UR18E^J(*eAJ&I%tqwS3TwsX!s+CU_3F{-WI_)_8tO*CQ#%b_so6o z@}HU^fnRNaK@#OZ{`jj>G_nx}$??xd_=T9uP4Fv4_`Vq`oqflGh!KA%xPz>gXiQW<3UcDyX7Qk559gLaD-x*#i741T^ov%%0@P4ubS%1z;;T+VNW9qSwB}t$MxyE<0+{G#S#6swEG_)CE}$X6 zFNutmCUU>79m2@{o@JfW)}y-#XOL(0XH7h}9pchO5)s!4NAH$oDD(Z%a&>)5;Iv`~ zM=RFJ5&TrUieXSJ@eTwC|g(Y6Q;x>-Gz1~R0_=!GyKlQWr z(hsq7>TvNq0iC`{0NT*0;%V>sx~c#T^&yNUxGiC|?W-vQPYTty?Wo_CDy+{K=p8P9 z8n<;qGFfG<@4S$OwV90GR(H*yRrtY~)xYdwq!qK4`dA*joh+xFR`-DVv1ld=|6f18 zMJ{yRP*c)rNj-ym*Ep;(@R&0|*AthTyG0t|W8h0XHTSqQcrm&AWVtj+T^^cQPK}%` zGR3`4p+VePKErv_!~U-pmDa#Jnbw*yQ*l)c4_c_b3@dWWCjOClV)#!9ko98&q_55Nt(Bp&u)s5?_pUX`>U?zxS5C(M4r8CHF zCn17Be52dfF%xTy8NpbbN1ggyrJ=y=nh9b;YFFp+?jDF84mj13ClB?);zt)0`3y|g z9gG<~qIc)qP5Vq(MQ}%-dcqn-2Hoep zAAJd6*mo$X-@zw*rwXh>@J&dVGr;h>j8N1d36BCo(EHWRh?Yl(vk&_7MJ?oiE?(Is^ix3TrUlh#_t!>81do=avUbp>C z@3A|X4Km0DG#w!pQM_$-@kIj=rOiDob@<3}tAhsQtVW@V;Nt#ty?dzoWvChi%d&sJ zFO?=>^OqEtl=>X2^i{R?3y5((c9VNkSKD?C`&fjh_njr`LLd4CGXBu_5R!1D*_lS1 S9)G&Ct<1_e_ULb@W9%P)QhKuh diff --git a/spec/hub_test_spec.rb b/spec/extended_test_spec.rb similarity index 76% rename from spec/hub_test_spec.rb rename to spec/extended_test_spec.rb index e5bf13f6..49e96de1 100644 --- a/spec/hub_test_spec.rb +++ b/spec/extended_test_spec.rb @@ -3,7 +3,7 @@ describe 'Powerpoint parsing a sample PPTX file' do before(:all) do @deck = Powerpoint::Presentation.new - @deck.add_hub_intro 'Bicycle Of the Mind', 'created by Steve Jobs' + @deck.add_extended_intro 'Bicycle Of the Mind', 'created by Steve Jobs' @deck.save 'samples/pptx/sample.pptx' # Examine the PPTX file end diff --git a/template/ppt/theme/theme2.xml b/template/ppt/theme/theme2.xml new file mode 100644 index 00000000..3f8f5df0 --- /dev/null +++ b/template/ppt/theme/theme2.xml @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From fb565d40ad9b71622dc7b05cb3b7c28a3fa62775 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 10:56:54 +0100 Subject: [PATCH 003/561] solid fill --- lib/powerpoint/views/content_type.xml.erb | 2 +- .../views/extended_intro_slide.xml.erb | 3 +++ lib/powerpoint/views/presentation.xml.rel.erb | 2 +- samples/pptx/sample.pptx | Bin 1502092 -> 1502095 bytes .../slideMasters/_rels/slideMaster1.xml.rels | 2 +- template/ppt/theme/theme2.xml | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/content_type.xml.erb b/lib/powerpoint/views/content_type.xml.erb index 2798d86d..7b2a6828 100644 --- a/lib/powerpoint/views/content_type.xml.erb +++ b/lib/powerpoint/views/content_type.xml.erb @@ -12,7 +12,7 @@ <% end %> - + diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index c715d122..06898a04 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -13,6 +13,9 @@ + + + diff --git a/lib/powerpoint/views/presentation.xml.rel.erb b/lib/powerpoint/views/presentation.xml.rel.erb index e970d24e..79470cf4 100644 --- a/lib/powerpoint/views/presentation.xml.rel.erb +++ b/lib/powerpoint/views/presentation.xml.rel.erb @@ -3,7 +3,7 @@ - + <% slides.each_with_index do |slide, index| %> <% id = 5 + (index+1) %> diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index 17cf4b83ef79d54fdf62f79099a0e2b62b713266..9115727f40241b8acd75c1c933a789ecb6cd6130 100644 GIT binary patch delta 3521 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 Zc7p$7GSZ(=cu9EU0J0DsY(!*D{|8wBlnMX< diff --git a/template/ppt/slideMasters/_rels/slideMaster1.xml.rels b/template/ppt/slideMasters/_rels/slideMaster1.xml.rels index b7afc216..9f1511b6 100755 --- a/template/ppt/slideMasters/_rels/slideMaster1.xml.rels +++ b/template/ppt/slideMasters/_rels/slideMaster1.xml.rels @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/template/ppt/theme/theme2.xml b/template/ppt/theme/theme2.xml index 3f8f5df0..5d787728 100644 --- a/template/ppt/theme/theme2.xml +++ b/template/ppt/theme/theme2.xml @@ -9,7 +9,7 @@ - + From f957a43dc735d69acc2ab6ff76007482da40baff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:02:52 +0100 Subject: [PATCH 004/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 06898a04..2d4a4761 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -1,6 +1,17 @@ + + + + + + + + + + + @@ -13,9 +24,6 @@ - - - From 5ecc066abf0da5a9de1544475526ec131a0a218b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:06:19 +0100 Subject: [PATCH 005/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 2d4a4761..d747dcf5 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -5,8 +5,6 @@ - - From f80aef5522663c4c124f23bec04c4cf80d2c065c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:09:48 +0100 Subject: [PATCH 006/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index d747dcf5..e4d858f1 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -4,7 +4,7 @@ - + From 97b7e4a270cab5e6851f18c8dc0f85f03bf5490f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:14:08 +0100 Subject: [PATCH 007/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index e4d858f1..e525ee57 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -4,7 +4,7 @@ - + From 00c2ad5ab56fce6f8359da959ec26cc5cc364efe Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:19:40 +0100 Subject: [PATCH 008/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index e525ee57..caf5f4bb 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -4,7 +4,9 @@ - + + + From 427f9149913646a498aa0d2bab04419594f1750c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:23:43 +0100 Subject: [PATCH 009/561] solid fill --- lib/powerpoint/views/extended_intro_slide.xml.erb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index caf5f4bb..26189c63 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -4,10 +4,7 @@ - - - - + From c739b2c6a729845dee76024faad81d0b811bcdaf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:51:13 +0100 Subject: [PATCH 010/561] rotation --- .../views/extended_intro_slide.xml.erb | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 26189c63..ec70e06d 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -58,7 +58,7 @@ - + @@ -69,6 +69,29 @@ + + + + + + + + + + + + + + + + + + <%= subtitile_2 %> + + + + + From 85ff8cb0363f8eaea137ef6753f200875bd24c08 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 11:53:52 +0100 Subject: [PATCH 011/561] rotation --- .../views/extended_intro_slide.xml.erb | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index ec70e06d..6d445617 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + @@ -69,29 +69,6 @@ - - - - - - - - - - - - - - - - - - <%= subtitile_2 %> - - - - - From b998304ecde0357e98c372519f51d7c865008e0e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 12:15:03 +0100 Subject: [PATCH 012/561] images --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/extended_intro.rb | 22 +++++++++++++++++++--- samples/pptx/sample.pptx | Bin 1502095 -> 1502097 bytes spec/extended_test_spec.rb | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index cefbae23..07a733db 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -38,9 +38,9 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_extended_intro(title, subtitile = nil) + def add_extended_intro(title, image_path, subtitile = nil, coords = {}) existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] - slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitile: subtitile) + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitile: subtitile, image_path: image_path, coords: coords) if existing_intro_slide @slides[@slides.index(existing_intro_slide)] = slide else diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index aa53a282..6cc14031 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -6,22 +6,38 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitile + attr_reader :title, :subtitile, :coords, :image_path, :image_name def initialize(options={}) - require_arguments [:title, :subtitile], options + require_arguments [:title, :subtitile, :image_path], options options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + @image_name = File.basename(@image_path) end def save(extract_path, index) + copy_media(extract_path, @image_path) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end def file_type - nil + File.extname(image_name).gsub('.', '') end + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + def save_rel_xml(extract_path, index) render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index 9115727f40241b8acd75c1c933a789ecb6cd6130..fe378c49f0174dfea817685f6f677563a6ceead9 100644 GIT binary patch delta 4707 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 delta 4592 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 Yzt@oCo4Yk{@+%CS0Ag&}%>cpw14rr72mk;8 diff --git a/spec/extended_test_spec.rb b/spec/extended_test_spec.rb index 49e96de1..b8625806 100644 --- a/spec/extended_test_spec.rb +++ b/spec/extended_test_spec.rb @@ -3,7 +3,7 @@ describe 'Powerpoint parsing a sample PPTX file' do before(:all) do @deck = Powerpoint::Presentation.new - @deck.add_extended_intro 'Bicycle Of the Mind', 'created by Steve Jobs' + @deck.add_extended_intro 'Bicycle Of the Mind','samples/images/sample_png.png', 'created by Steve Jobs' @deck.save 'samples/pptx/sample.pptx' # Examine the PPTX file end From a6f42d8c3d7a0bffe35943efabb7d1d4ad077818 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 16:34:42 +0100 Subject: [PATCH 013/561] images --- lib/powerpoint/slide/extended_intro.rb | 4 +- .../views/extended_intro_slide.xml.erb | 36 ++++++++++++++++++ .../views/extended_intro_slide_rel.xml.erb | 5 +++ samples/pptx/sample.pptx | Bin 1502097 -> 1502097 bytes 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 lib/powerpoint/views/extended_intro_slide_rel.xml.erb diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 6cc14031..afa132e0 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -1,4 +1,6 @@ +require 'zip/filesystem' require 'fileutils' +require 'fastimage' require 'erb' module Powerpoint @@ -6,7 +8,7 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitile, :coords, :image_path, :image_name + attr_reader :title, :subtitile, :image_name, :coords, :image_path def initialize(options={}) require_arguments [:title, :subtitile, :image_path], options diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 6d445617..a294475e 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -69,6 +69,42 @@ + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb new file mode 100644 index 00000000..2ccd226e --- /dev/null +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index fe378c49f0174dfea817685f6f677563a6ceead9..16e435db12874fe309fcb3dc6db1100e8f9afe60 100644 GIT binary patch delta 1679 zcmYk5ZA_b06vs>7#!4w2V`pfYW3{>}zN{(^5hs(fEMZ7t@-j$AX5!{ce3zLx7iFN+ z8BOp>xR4E!g%35GqNB+k20Xg+}0hk_*t!>+N^glpnLR$Q8@}VHss~=DG->+`NNGM$>0iJOy@tu`@$Y@yZ7V zIL)q8{Mct7ZQ|NpP_9p>eTCn|-tN(9G{Z_o!QKAhqCWZ!e^YTMr`0{rxBau_6TaAP1Yfp1sov)~MOCd$w!IxgUP3f-Bp@gCO2!RIhRRbTuP{T*OVC)q(Uzg5qAf==p{1dj(bCZ@Xc=f$v=wNXXe-gO z&{nBI7nC<)adwA~51p0zfNqcah7S%<1Jyr|K{H>x+Y2MqV)e-r(9ah){qPfC44wo& zH1+)fh=?h_)nAhSB~Gi<+nLkF)6K-?Y85e!3qYO(6>hU=7O)Lx>V?g~djeeva?N`)y-u&javpAKn<>CBEHw z9_FZU*#&UWzBezxO8PSUI07^>_FV+%MX*E!o+92m2J|FY;}{eXyT;&Y;?x*yAX+a% zF|q0*JWf0$bx6_@g#z+#jf#5T#vq6FL}48{&qSe|xN2M!tr>?B(uc>PjyO1t$tz-f zo~$S)D(s8FBNW6+{DccJc$W00OQP84k`t17mxcd5$x+Gd39;|R2@zK%jgvxGPl`je zPl`kBqQfjsiZ*ajIh7=iCkw-sq)2137?5J|3hba$^Fps(O-c_)VVwRyW2qUXv_m^1 z&Q&raI=*iP%E*tM&SCKxpcl%t*F>=J8n{V+D0xPbCp+UJc}rZ(_=7lXrsNSx!*!vz zN`7`7o}qYH>dYG=UM<-nd0FzV1Uy0ceCACFG4qZDY~z>Gxwq;F>rMbL?JR8IuKGQD zJ{2y{lIw-E=mC~7hgsd|qH4d+iutVl4YrYfRdP^r`JC|A&WS#CNR9U0cLL;Q3u delta 1679 zcmYk5draF^6vs0Xg~s51l8Z3N>m6{|lpnLR$Q8~0VFhJ$m3eCI^cMiy#0>nb(TI)TXk>a+)En0Ml)blT!nUDNnVDY;?)lf zahjc{__5DE+QM~NVWmEu_7!~-eY;nu(Tplpg?IZ#iwEd8d@UtioYt}hzU`lFpYUym zD!$~u*_CTk9?VNsimEJhm>|mTI*Uc8N$#K0TJ}+~UImkKy8blRwFQdWupCm;D1uX;3inaN zho-(i1Yt4dw+2hozrtyin>&sJsPB9aM|qXCqY%*Xc|Mf(cg%$uD!Y9Q)~be|p_ww+ z9zWzG@!r^2zaO$vY4{@px3;pGaj>&r5@2Gc0Aw)3IGm&NOpZe)wNL#$AQl}#xJi|k zg76pl|2T_&{!QB}8)pac(G;F4-Pyx%sq{yYHx_TkNOkN9@; zd6=id6&Juk``)|&tLe+^<1o<3*mq%|7r_!?c#3%M1kjUU%@a^e?4E$9i8B+hiD& zV_F=_Lx)+K7H#07dL~I6PZowNNs;DcF(k#(71%|m=7nCnnw0LB!Z`bX#&R>tX@@o@ z&Q%%{9p4{=3i4y8b67kE^g@~Tng|wMgEG<|N}iGA$$4>+ye%$f{6QSHQu3Ij;kwY< zB|pCo&rm!hb>q!7G?Hp|4uExE4 zKNT+5vg?Jk$U&Adk6AtFqH4d+iTSMm4R(-zRdQHz<-G9M&x<~FN{#m>hiMl8Xw#hw L;+J Date: Thu, 3 Dec 2020 16:55:06 +0100 Subject: [PATCH 014/561] images --- lib/powerpoint/slide/extended_intro.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index afa132e0..8bd09710 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -41,7 +41,7 @@ def default_coords private :default_coords def save_rel_xml(extract_path, index) - render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml From 6998babfe6367833cba36ff2881cba9a5e895ccc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 3 Dec 2020 17:53:31 +0100 Subject: [PATCH 015/561] images --- samples/pptx/sample.pptx | Bin 1502097 -> 1502097 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index 16e435db12874fe309fcb3dc6db1100e8f9afe60..cc6025d06804fdafe912dceb6787ca7200e248bd 100644 GIT binary patch delta 1679 zcmYk5ZA_b06vs>7MoTFjV`pfYW3{>}zN{(^5hoK^mN29+c^RZ5Gja1JzROIUi!!1^ zjVAacT*wB=!iSno(a~fN1at#+DNSeHR#v(J8?0Lq41RHvCF(rq-izsnli&THbMATW zbI!f((Z=>@qs3FM(`RWknpBOct=+OgYic`@zb6Hubf?^h@CQ=9))M#W(}+r|(LvH@ z+@&M=x)+qS=1g+A%|0XXlI@0pLZfg$$we68^$s}g%8%Ju+5-<*RhFYhvO8NbxtQG9dJHO-ahB^I;*LzwW_ya?j?<0qv^LPo&txz*p;EDc+~@g zoEG;fe(bZ4HgjECP@zw!eTCn|-tN_DG$Tr7!QK9mqJH`fe{*pcr>%5>Z~JF!8{c-Q z{0sh@UAcDUL076$SZSrhgiv5=p|dg{(Cty*@WDZ9p!(-AXyJ=@`(Tt>tUh@H2KeHpAAaJCp_9Oe zroKN25i#Yr21?Su#A%gTI*tRV?|ctOd6hLI5Y+K`K9u(NtOqkxcKaBtQ4K#s6J@YH z0mwt*y|J^t0A!`o@Q3?vZDG@6;9$Qbz|71+$Y6#sI7jE17=uh|pZa@HEILAPlPWER z;4kw3aTfjjoAy^W%nab8DP-XQtYvv&2vNeVu-M4b&+(mjzwK<@c>w7#!4w2V`pfYW3{>}zN{(^5hs(fEMZ7t@-j$AX5!{ce3zLx7iFN+ z8BOp>xR4E!g%35GqNB+k20Xg+}0hk_*t!>+N^glpnLR$Q8@}VHss~=DG->+`NNGM$>0iJOy@tu`@$Y@yZ7V zIL)q8{Mct7ZQ|NpP_9p>eTCn|-tN(9G{Z_o!QKAhqCWZ!e^YTMr`0{rxBau_6TaAP1Yfp1sov)~MOCd$w!IxgUP3f-Bp@gCO2!RIhRRbTuP{T*OVC)q(Uzg5qAf==p{1dj(bCZ@Xc=f$v=wNXXe-gO z&{nBI7nC<)adwA~51p0zfNqcah7S%<1Jyr|K{H>x+Y2MqV)e-r(9ah){qPfC44wo& zH1+)fh=?h_)nAhSB~Gi<+nLkF)6K-?Y85e!3qYO(6>hU=7O)Lx>V?g~djeeva?N`)y-u&javpAKn<>CBEHw z9_FZU*#&UWzBezxO8PSUI07^>_FV+%MX*E!o+92m2J|FY;}{eXyT;&Y;?x*yAX+a% zF|q0*JWf0$bx6_@g#z+#jf#5T#vq6FL}48{&qSe|xN2M!tr>?B(uc>PjyO1t$tz-f zo~$S)D(s8FBNW6+{DccJc$W00OQP84k`t17mxcd5$x+Gd39;|R2@zK%jgvxGPl`je zPl`kBqQfjsiZ*ajIh7=iCkw-sq)2137?5J|3hba$^Fps(O-c_)VVwRyW2qUXv_m^1 z&Q&raI=*iP%E*tM&SCKxpcl%t*F>=J8n{V+D0xPbCp+UJc}rZ(_=7lXrsNSx!*!vz zN`7`7o}qYH>dYG=UM<-nd0FzV1Uy0ceCACFG4qZDY~z>Gxwq;F>rMbL?JR8IuKGQD zJ{2y{lIw-E=mC~7hgsd|qH4d+iutVl4YrYfRdP^r`JC|A&WS#CNR9U0cLL;Q3u From 6154aaaca08306cd9079e4b640716471368f8b0a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 13:59:01 +0100 Subject: [PATCH 016/561] fonts --- lib/powerpoint/views/extended_intro_slide.xml.erb | 12 +++++++++++- template/ppt/theme/theme2.xml | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a294475e..a2bc7c76 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -45,6 +45,11 @@ + + + + + @@ -58,7 +63,7 @@ - + @@ -68,6 +73,11 @@ + + + + + diff --git a/template/ppt/theme/theme2.xml b/template/ppt/theme/theme2.xml index 5d787728..2a081e6e 100644 --- a/template/ppt/theme/theme2.xml +++ b/template/ppt/theme/theme2.xml @@ -41,7 +41,7 @@ - + @@ -75,7 +75,7 @@ - + From 55dd90dc53a9ce18512c9c3600df2c0c2453d1c9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 14:22:27 +0100 Subject: [PATCH 017/561] fonts --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a2bc7c76..7c2843c7 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + @@ -63,7 +63,7 @@ - + From 29c6572dde8e462d482df542aea611ef80e041c9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 14:36:34 +0100 Subject: [PATCH 018/561] fonts --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 7c2843c7..5e421b3c 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -30,7 +30,7 @@ - + @@ -58,7 +58,7 @@ - + From a428dd932499981f42294f994afda011db8c3f15 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 14:40:49 +0100 Subject: [PATCH 019/561] fonts --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5e421b3c..00cc198d 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + @@ -63,7 +63,7 @@ - + From 8d374b3be9a0f0a518fe0faf4531d12c7770967b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:02:45 +0100 Subject: [PATCH 020/561] spelling mistake correction and second subtitle --- lib/powerpoint/presentation.rb | 4 +-- lib/powerpoint/slide/extended_intro.rb | 4 +-- .../views/extended_intro_slide.xml.erb | 30 +++++++++++++++++- samples/pptx/sample.pptx | Bin 1502097 -> 1502104 bytes spec/extended_test_spec.rb | 2 +- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 07a733db..59056d1b 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -38,9 +38,9 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_extended_intro(title, image_path, subtitile = nil, coords = {}) + def add_extended_intro(title, image_path, subtitle = nil,subtitle_2 = nil, coords = {}) existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] - slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitile: subtitile, image_path: image_path, coords: coords) + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path,subtitle_2: subtitle_2, coords: coords) if existing_intro_slide @slides[@slides.index(existing_intro_slide)] = slide else diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 8bd09710..a85bce9d 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -8,10 +8,10 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitile, :image_name, :coords, :image_path + attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path def initialize(options={}) - require_arguments [:title, :subtitile, :image_path], options + require_arguments [:title, :subtitle, :image_path, :subtitle_2], options options.each {|k, v| instance_variable_set("@#{k}", v)} @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 00cc198d..11f2d5be 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -68,7 +68,35 @@ - <%= subtitile %> + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index cc6025d06804fdafe912dceb6787ca7200e248bd..c0661f69461fb8d2fc9dff315a9a90a7c5671a73 100644 GIT binary patch delta 4798 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 QtZ6h1LgN=-e*h5tf1ctcKL7v# delta 4819 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 OpuaYB^D>Z*ApReBBP$*N diff --git a/spec/extended_test_spec.rb b/spec/extended_test_spec.rb index b8625806..bc8b67f3 100644 --- a/spec/extended_test_spec.rb +++ b/spec/extended_test_spec.rb @@ -3,7 +3,7 @@ describe 'Powerpoint parsing a sample PPTX file' do before(:all) do @deck = Powerpoint::Presentation.new - @deck.add_extended_intro 'Bicycle Of the Mind','samples/images/sample_png.png', 'created by Steve Jobs' + @deck.add_extended_intro 'Bicycle Of the Mind','samples/images/sample_png.png', 'created by Steve Jobs', 'created by bob' @deck.save 'samples/pptx/sample.pptx' # Examine the PPTX file end From 935a0057f56e4cd3cb6f9f2a220800b2ee813e28 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:10:48 +0100 Subject: [PATCH 021/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 11f2d5be..94fb6e3d 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -81,12 +81,12 @@ - + - + From c15993a3979421bf68da1566771cc19752cd8ec5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:33:49 +0100 Subject: [PATCH 022/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 94fb6e3d..ab6f2e36 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -86,7 +86,7 @@ - + From f2a1a4007cb757a728b9640b36691d266f6cdafc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:47:49 +0100 Subject: [PATCH 023/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index ab6f2e36..e9c7e7ad 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -47,7 +47,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -91,7 +91,6 @@ - @@ -103,7 +102,7 @@ - + From 9208447915965f7e8e65fdd50fa9b88cd3afc174 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:51:58 +0100 Subject: [PATCH 024/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index e9c7e7ad..5d38c658 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -86,7 +86,7 @@ - + From 921856dc7001da6d7132f2fcddc28c2d214abe83 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 15:54:52 +0100 Subject: [PATCH 025/561] spelling mistake correction and second subtitle --- .../views/extended_intro_slide.xml.erb | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5d38c658..7c95373c 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -79,33 +79,6 @@ - - - - - - - - - - - - - - - - - <%= subtitle_2 %> - - - - - - - - - - From b3c2c096a7263bc889a6a3468ac64f7aaff932a8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:02:53 +0100 Subject: [PATCH 026/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 7c95373c..a2bc7c76 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -30,12 +30,12 @@ - + - + @@ -47,7 +47,7 @@ - + @@ -58,24 +58,24 @@ - + - + - <%= subtitle %> + <%= subtitile %> - + From 2e03fa47188d41a27be825a9b1aafc61412f36f6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:18:49 +0100 Subject: [PATCH 027/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a2bc7c76..d9de5bcf 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -68,7 +68,7 @@ - <%= subtitile %> + <%= subtitle %> From afbcaed8029b4b56af3db06008c241dd5b266a71 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:22:42 +0100 Subject: [PATCH 028/561] spelling mistake correction and second subtitle --- .../views/extended_intro_slide.xml.erb | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index d9de5bcf..ff35f59e 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -78,10 +78,38 @@ + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + + + + + - + From 79cc02be22ee631b4e9c3d5756a958b3bcedbf5b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:30:14 +0100 Subject: [PATCH 029/561] spelling mistake correction and second subtitle --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index ff35f59e..5afbe6fc 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -91,7 +91,7 @@ - + From 74ed7db8a0280d3c23b69db41523db625dc8d00e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:33:25 +0100 Subject: [PATCH 030/561] spelling mistake correction and second subtitle --- .../views/extended_intro_slide.xml.erb | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5afbe6fc..36de6d15 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -107,9 +107,37 @@ + + + + + + + + + + + + + + + + + + <%= Date.today %> + + + + + + + + + + - + From 0bc12a28b31f96c824bcd46437f05215ee5bc479 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 16:59:35 +0100 Subject: [PATCH 031/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 0a295ae2..cfc9f2f2 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From 26f9f35c418822e5a3c3807249f2e06211d3fbcc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:12:24 +0100 Subject: [PATCH 032/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index cfc9f2f2..c4f86eed 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 08d64dac103556fa4726855f4d501aeded0290ce Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:16:59 +0100 Subject: [PATCH 033/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index c4f86eed..6e01e74e 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 6717dbb0d52695c9fb543050f83ffffb37e57941 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:19:19 +0100 Subject: [PATCH 034/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 6e01e74e..0a295ae2 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -28,7 +28,7 @@ - + From c6ce824333f4d39a51146a6e372066106c074b8b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:19:47 +0100 Subject: [PATCH 035/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 0a295ae2..6e01e74e 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -28,7 +28,7 @@ - + From 6578cd6de6c4ca895d5aaa1cf5426321ae4a1e7e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:23:41 +0100 Subject: [PATCH 036/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 6e01e74e..5368b239 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 292b6968ee7a2b445b3c56d89b3ddc32e3ecbf5f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:23:45 +0100 Subject: [PATCH 037/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 5368b239..78678786 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From be5aac9db25b4193092cdbdb3610fd19aa90dc00 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:26:00 +0100 Subject: [PATCH 038/561] templates --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 36de6d15..82eb7b97 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + From 8448bec0d540a0b590660dd447cd6dec9ce54bad Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:29:18 +0100 Subject: [PATCH 039/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 78678786..2a6959f6 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From 06e64bd75ff63a97f41f491d8f9f253eecfb1eeb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:33:19 +0100 Subject: [PATCH 040/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 2a6959f6..c213c4cc 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 68f86534b88035f15616a391f506cf2e075e18bb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:36:05 +0100 Subject: [PATCH 041/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index c213c4cc..4b765e7b 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From 8e6a016a43a95596438fe819457ae48507292924 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:39:45 +0100 Subject: [PATCH 042/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 4b765e7b..2684209c 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From 857277bd548195c2368d8da4cc43a008b6bd09c9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:41:52 +0100 Subject: [PATCH 043/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 2684209c..c268e6fe 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 02511b0df0765fa9b76abbdef8848aad8560a6f4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:44:52 +0100 Subject: [PATCH 044/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index c268e6fe..ca305a24 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + From 1bb7a5df46a15b849df27546515fcddce398a49b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:47:23 +0100 Subject: [PATCH 045/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index ca305a24..a5c4ff55 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From eeccf18067fc6c555aecbaa7959a14df4abd7dff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 17:53:38 +0100 Subject: [PATCH 046/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index a5c4ff55..e4b9abc3 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,7 +27,7 @@ - + From 291192718885dfdf4bcb57cb729e05fc61aa202a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 4 Dec 2020 18:05:58 +0100 Subject: [PATCH 047/561] templates --- template/ppt/slideLayouts/slideLayout1.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index e4b9abc3..354df548 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -35,6 +35,11 @@ + + + + + Click to edit Master title style From 087c45cc4b0079188c10556d4b8b6c11a79999b7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 7 Dec 2020 15:01:04 +0100 Subject: [PATCH 048/561] real coordinates --- template/ppt/slideLayouts/slideLayout1.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 354df548..15202bed 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -27,8 +27,8 @@ - - + + @@ -60,8 +60,8 @@ - - + + From 543e1e2daa00bdd011ef11a84a1359d5537b9a4c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 7 Dec 2020 16:13:55 +0100 Subject: [PATCH 049/561] real coordinates --- template/ppt/slideLayouts/slideLayout1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/ppt/slideLayouts/slideLayout1.xml b/template/ppt/slideLayouts/slideLayout1.xml index 15202bed..45fc766e 100755 --- a/template/ppt/slideLayouts/slideLayout1.xml +++ b/template/ppt/slideLayouts/slideLayout1.xml @@ -32,7 +32,7 @@ - + @@ -65,7 +65,7 @@ - + From 8735f38921acb1229ef0ccca4609bf90f2f2e39f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 10 Dec 2020 14:52:53 +0100 Subject: [PATCH 050/561] presentation xml --- lib/powerpoint/views/presentation.xml.erb | 192 +++++++++++----------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/lib/powerpoint/views/presentation.xml.erb b/lib/powerpoint/views/presentation.xml.erb index b3f3be07..82de0bc0 100644 --- a/lib/powerpoint/views/presentation.xml.erb +++ b/lib/powerpoint/views/presentation.xml.erb @@ -8,103 +8,103 @@ <% end %> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 437a59ddddae18d06dc3c384a6ce83303d4fa526 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 10 Dec 2020 16:08:29 +0100 Subject: [PATCH 051/561] ranking xml --- lib/powerpoint/presentation.rb | 20 +++--- lib/powerpoint/slide/ranking.rb | 54 +++++++++++++++ lib/powerpoint/views/ranking.xml.erb | 87 ++++++++++++++++++++++++ lib/powerpoint/views/ranking_rel.xml.erb | 5 ++ 4 files changed, 158 insertions(+), 8 deletions(-) create mode 100644 lib/powerpoint/slide/ranking.rb create mode 100644 lib/powerpoint/views/ranking.xml.erb create mode 100644 lib/powerpoint/views/ranking_rel.xml.erb diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 59056d1b..4801a134 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -22,6 +22,16 @@ def add_intro(title, subtitile = nil) end end + def add_extended_intro(title, image_path, subtitle = nil,subtitle_2 = nil, coords = {}) + existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path,subtitle_2: subtitle_2, coords: coords) + if existing_intro_slide + @slides[@slides.index(existing_intro_slide)] = slide + else + @slides.insert 0, slide + end + end + def add_textual_slide(title, content = []) @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, content: content) end @@ -38,14 +48,8 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_extended_intro(title, image_path, subtitle = nil,subtitle_2 = nil, coords = {}) - existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] - slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path,subtitle_2: subtitle_2, coords: coords) - if existing_intro_slide - @slides[@slides.index(existing_intro_slide)] = slide - else - @slides.insert 0, slide - end + def add_ranking_slide(title,images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, content: content) end def save(path) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb new file mode 100644 index 00000000..bd6ee8e0 --- /dev/null +++ b/lib/powerpoint/slide/ranking.rb @@ -0,0 +1,54 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Ranking + include Powerpoint::Util + + attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path + + def initialize(options={}) + require_arguments [:title, :subtitle, :image_path, :subtitle_2], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + @image_name = File.basename(@image_path) + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + File.extname(image_name).gsub('.', '') + end + + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + + def save_rel_xml(extract_path, index) + render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('extended_intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb new file mode 100644 index 00000000..c092b66c --- /dev/null +++ b/lib/powerpoint/views/ranking.xml.erb @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb new file mode 100644 index 00000000..2ccd226e --- /dev/null +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 93dfa7693ab1c838b70de868599095cf24687e16 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 11 Dec 2020 14:11:16 +0100 Subject: [PATCH 052/561] multiple images --- lib/powerpoint/slide/ranking.rb | 6 +++--- lib/powerpoint/views/ranking.xml.erb | 4 +++- lib/powerpoint/views/ranking_rel.xml.erb | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index bd6ee8e0..833fe62b 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -8,13 +8,13 @@ module Slide class Ranking include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path + attr_reader :title, :subtitle, :images def initialize(options={}) - require_arguments [:title, :subtitle, :image_path, :subtitle_2], options + require_arguments [:title, :subtitle, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @coords = default_coords unless @coords.any? - @image_name = File.basename(@image_path) + images end def save(extract_path, index) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index c092b66c..c3dad1bd 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -15,6 +15,7 @@ + <% images.each_with_index do |image, index| %> @@ -32,7 +33,7 @@ - <%= title %> + <%= image['title'] %> @@ -74,6 +75,7 @@ <% end %> + <% end %> diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index 2ccd226e..f7d5ed87 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -1,5 +1,7 @@ - + <% images.each_with_index do |image, index| %> + + <% end %> \ No newline at end of file From 32ea6c1153cd5337cd8517904c713a37c94986a5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 11 Dec 2020 17:14:25 +0100 Subject: [PATCH 053/561] multiple images --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 4801a134..9bfc83f9 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,7 +49,7 @@ def add_picture_description_slide(title, image_path, content = []) end def add_ranking_slide(title,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, content: content) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, images: images) end def save(path) From 2da9fc40fcf545f5536ea250e4f1b03807b1bb04 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 11 Dec 2020 17:33:58 +0100 Subject: [PATCH 054/561] multiple images --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 9bfc83f9..2908684e 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,7 +49,7 @@ def add_picture_description_slide(title, image_path, content = []) end def add_ranking_slide(title,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, images: images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle, images: images) end def save(path) From 6c80484fe08c22f69d952e01fdfb02f3a04b239a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 11 Dec 2020 17:48:58 +0100 Subject: [PATCH 055/561] multiple images --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 2908684e..01e0c2ab 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,7 +48,7 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_ranking_slide(title,images) + def add_ranking_slide(title,images,subtitle = nil) @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle, images: images) end From 9e0c507379a0c262924e2d5155549d25cc998302 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 14 Dec 2020 10:03:16 +0100 Subject: [PATCH 056/561] multiple images --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 01e0c2ab..e0b23b58 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,7 +48,7 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_ranking_slide(title,images,subtitle = nil) + def add_ranking_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle, images: images) end From 94d7b80f3997d5626b2dfd2fdf6aacfaf10224eb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 14 Dec 2020 10:06:20 +0100 Subject: [PATCH 057/561] multiple images --- lib/powerpoint/util.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index fbee597e..e73445f0 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -18,8 +18,10 @@ def read_template(filename) File.read("#{Powerpoint::VIEW_PATH}/#{filename}") end - def require_arguments(required_argements, argements) - raise ArgumentError unless required_argements.all? {|required_key| argements.keys.include? required_key} + def require_arguments(required_arguements, arguements) + puts required_arguements.inspect + puts arguements.inspect + raise ArgumentError unless required_arguements.all? {|required_key| arguements.keys.include? required_key} end def copy_media(extract_path, image_path) From d6d9fe841c4856dc001212c40bd14209b8705a18 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 14 Dec 2020 10:09:39 +0100 Subject: [PATCH 058/561] multiple images --- lib/powerpoint/util.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index e73445f0..c7006598 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -19,8 +19,10 @@ def read_template(filename) end def require_arguments(required_arguements, arguements) + puts '---------------------->' puts required_arguements.inspect puts arguements.inspect + puts '---------------------->' raise ArgumentError unless required_arguements.all? {|required_key| arguements.keys.include? required_key} end From f68bc18b3ca6d625e6a9104ba9ac96841e986d03 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 14 Dec 2020 14:43:31 +0100 Subject: [PATCH 059/561] arguements --- lib/powerpoint/util.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index c7006598..a9f731c2 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -19,9 +19,10 @@ def read_template(filename) end def require_arguments(required_arguements, arguements) - puts '---------------------->' + puts '--required-------------------->' puts required_arguements.inspect - puts arguements.inspect + puts '--required-------------------->' + puts arguements.keys.inspect puts '---------------------->' raise ArgumentError unless required_arguements.all? {|required_key| arguements.keys.include? required_key} end From a903b0ee160c778bb0e3f33fac893c20f834845c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 18 Dec 2020 15:32:12 +0100 Subject: [PATCH 060/561] add in all the tasks --- lib/powerpoint/presentation.rb | 16 +++++ lib/powerpoint/slide/4d.rb | 54 ++++++++++++++ lib/powerpoint/slide/collage.rb | 54 ++++++++++++++ lib/powerpoint/slide/concept.rb | 54 ++++++++++++++ lib/powerpoint/slide/image.rb | 54 ++++++++++++++ lib/powerpoint/slide/ranking.rb | 4 +- lib/powerpoint/views/4d.xml.erb | 89 ++++++++++++++++++++++++ lib/powerpoint/views/4d_rel.xml.erb | 7 ++ lib/powerpoint/views/collage.xml.erb | 89 ++++++++++++++++++++++++ lib/powerpoint/views/collage_rel.xml.erb | 7 ++ lib/powerpoint/views/concept.xml.erb | 89 ++++++++++++++++++++++++ lib/powerpoint/views/concept_rel.xml.erb | 7 ++ lib/powerpoint/views/image.xml.erb | 89 ++++++++++++++++++++++++ lib/powerpoint/views/image_rel.xml.erb | 7 ++ 14 files changed, 618 insertions(+), 2 deletions(-) create mode 100644 lib/powerpoint/slide/4d.rb create mode 100644 lib/powerpoint/slide/collage.rb create mode 100644 lib/powerpoint/slide/concept.rb create mode 100644 lib/powerpoint/slide/image.rb create mode 100644 lib/powerpoint/views/4d.xml.erb create mode 100644 lib/powerpoint/views/4d_rel.xml.erb create mode 100644 lib/powerpoint/views/collage.xml.erb create mode 100644 lib/powerpoint/views/collage_rel.xml.erb create mode 100644 lib/powerpoint/views/concept.xml.erb create mode 100644 lib/powerpoint/views/concept_rel.xml.erb create mode 100644 lib/powerpoint/views/image.xml.erb create mode 100644 lib/powerpoint/views/image_rel.xml.erb diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index e0b23b58..b8308108 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,6 +52,22 @@ def add_ranking_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle, images: images) end + def add_image_slide(title, subtitle = nil,images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + end + + def add_4d_slide(title, subtitle = nil,images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + end + + def add_concept_slide(title, subtitle = nil,images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + end + + def add_collage_slide(title, subtitle = nil,images) + @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + end + def save(path) Dir.mktmpdir do |dir| extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}" diff --git a/lib/powerpoint/slide/4d.rb b/lib/powerpoint/slide/4d.rb new file mode 100644 index 00000000..1a308184 --- /dev/null +++ b/lib/powerpoint/slide/4d.rb @@ -0,0 +1,54 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Ranking + include Powerpoint::Util + + attr_reader :title, :subtitle, :images + + def initialize(options={}) + require_arguments [:title, :subtitle, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + images + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + File.extname(image_name).gsub('.', '') + end + + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + + def save_rel_xml(extract_path, index) + render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/slide/collage.rb b/lib/powerpoint/slide/collage.rb new file mode 100644 index 00000000..1a308184 --- /dev/null +++ b/lib/powerpoint/slide/collage.rb @@ -0,0 +1,54 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Ranking + include Powerpoint::Util + + attr_reader :title, :subtitle, :images + + def initialize(options={}) + require_arguments [:title, :subtitle, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + images + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + File.extname(image_name).gsub('.', '') + end + + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + + def save_rel_xml(extract_path, index) + render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb new file mode 100644 index 00000000..1a308184 --- /dev/null +++ b/lib/powerpoint/slide/concept.rb @@ -0,0 +1,54 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Ranking + include Powerpoint::Util + + attr_reader :title, :subtitle, :images + + def initialize(options={}) + require_arguments [:title, :subtitle, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + images + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + File.extname(image_name).gsub('.', '') + end + + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + + def save_rel_xml(extract_path, index) + render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/slide/image.rb b/lib/powerpoint/slide/image.rb new file mode 100644 index 00000000..1a308184 --- /dev/null +++ b/lib/powerpoint/slide/image.rb @@ -0,0 +1,54 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Ranking + include Powerpoint::Util + + attr_reader :title, :subtitle, :images + + def initialize(options={}) + require_arguments [:title, :subtitle, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @coords = default_coords unless @coords.any? + images + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def file_type + File.extname(image_name).gsub('.', '') + end + + def default_coords + slide_width = pixle_to_pt(720) + default_width = pixle_to_pt(550) + + return {} unless dimensions = FastImage.size(image_path) + image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} + new_width = default_width < image_width ? default_width : image_width + ratio = new_width / image_width.to_f + new_height = (image_height.to_f * ratio).round + {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} + end + private :default_coords + + def save_rel_xml(extract_path, index) + render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index 833fe62b..1a308184 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -41,12 +41,12 @@ def default_coords private :default_coords def save_rel_xml(extract_path, index) - render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('extended_intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end diff --git a/lib/powerpoint/views/4d.xml.erb b/lib/powerpoint/views/4d.xml.erb new file mode 100644 index 00000000..c3dad1bd --- /dev/null +++ b/lib/powerpoint/views/4d.xml.erb @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + <%= image['title'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/4d_rel.xml.erb b/lib/powerpoint/views/4d_rel.xml.erb new file mode 100644 index 00000000..f7d5ed87 --- /dev/null +++ b/lib/powerpoint/views/4d_rel.xml.erb @@ -0,0 +1,7 @@ + + + + <% images.each_with_index do |image, index| %> + + <% end %> + \ No newline at end of file diff --git a/lib/powerpoint/views/collage.xml.erb b/lib/powerpoint/views/collage.xml.erb new file mode 100644 index 00000000..c3dad1bd --- /dev/null +++ b/lib/powerpoint/views/collage.xml.erb @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + <%= image['title'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/collage_rel.xml.erb b/lib/powerpoint/views/collage_rel.xml.erb new file mode 100644 index 00000000..f7d5ed87 --- /dev/null +++ b/lib/powerpoint/views/collage_rel.xml.erb @@ -0,0 +1,7 @@ + + + + <% images.each_with_index do |image, index| %> + + <% end %> + \ No newline at end of file diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb new file mode 100644 index 00000000..c3dad1bd --- /dev/null +++ b/lib/powerpoint/views/concept.xml.erb @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + <%= image['title'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb new file mode 100644 index 00000000..f7d5ed87 --- /dev/null +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -0,0 +1,7 @@ + + + + <% images.each_with_index do |image, index| %> + + <% end %> + \ No newline at end of file diff --git a/lib/powerpoint/views/image.xml.erb b/lib/powerpoint/views/image.xml.erb new file mode 100644 index 00000000..c3dad1bd --- /dev/null +++ b/lib/powerpoint/views/image.xml.erb @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + <%= image['title'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/image_rel.xml.erb b/lib/powerpoint/views/image_rel.xml.erb new file mode 100644 index 00000000..f7d5ed87 --- /dev/null +++ b/lib/powerpoint/views/image_rel.xml.erb @@ -0,0 +1,7 @@ + + + + <% images.each_with_index do |image, index| %> + + <% end %> + \ No newline at end of file From 525538635f5db1385cb3b46a9a2c310621f2016d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 18 Dec 2020 15:56:42 +0100 Subject: [PATCH 061/561] fix right slides --- lib/powerpoint/presentation.rb | 10 +++++----- lib/powerpoint/slide/4d.rb | 2 +- lib/powerpoint/slide/collage.rb | 2 +- lib/powerpoint/slide/concept.rb | 2 +- lib/powerpoint/slide/image.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index b8308108..ddadef97 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,23 +49,23 @@ def add_picture_description_slide(title, image_path, content = []) end def add_ranking_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle, images: images) + @slides << Powerpoint::Slide::Ranking.new(presentation: self, title: title, subtitle: subtitle, images: images) end def add_image_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end def add_4d_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + @slides << Powerpoint::Slide::4d.new(presentation: self, title: title, subtitle: subtitle) end def add_concept_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle) end def add_collage_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, subtitle: subtitle) + @slides << Powerpoint::Slide::Collage.new(presentation: self, title: title, subtitle: subtitle) end def save(path) diff --git a/lib/powerpoint/slide/4d.rb b/lib/powerpoint/slide/4d.rb index 1a308184..bf2fde92 100644 --- a/lib/powerpoint/slide/4d.rb +++ b/lib/powerpoint/slide/4d.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Ranking + class 4d include Powerpoint::Util attr_reader :title, :subtitle, :images diff --git a/lib/powerpoint/slide/collage.rb b/lib/powerpoint/slide/collage.rb index 1a308184..43910012 100644 --- a/lib/powerpoint/slide/collage.rb +++ b/lib/powerpoint/slide/collage.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Ranking + class Collage include Powerpoint::Util attr_reader :title, :subtitle, :images diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 1a308184..15f36acb 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Ranking + class Concept include Powerpoint::Util attr_reader :title, :subtitle, :images diff --git a/lib/powerpoint/slide/image.rb b/lib/powerpoint/slide/image.rb index 1a308184..6f25c7e0 100644 --- a/lib/powerpoint/slide/image.rb +++ b/lib/powerpoint/slide/image.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Ranking + class Image include Powerpoint::Util attr_reader :title, :subtitle, :images From 2ab95640799490061886b17beeb751d190b27fe7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 18 Dec 2020 16:09:22 +0100 Subject: [PATCH 062/561] 4d to gallery --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/slide/{4d.rb => gallery.rb} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/powerpoint/slide/{4d.rb => gallery.rb} (100%) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index ddadef97..fc0fe9a3 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,7 +56,7 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_4d_slide(title, subtitle = nil,images) + def add_gallery_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::4d.new(presentation: self, title: title, subtitle: subtitle) end diff --git a/lib/powerpoint/slide/4d.rb b/lib/powerpoint/slide/gallery.rb similarity index 100% rename from lib/powerpoint/slide/4d.rb rename to lib/powerpoint/slide/gallery.rb From c54c5f9206e2fdb031c1d989d14cec98cd30d3fa Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 18 Dec 2020 17:24:08 +0100 Subject: [PATCH 063/561] 4d to gallery --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index fc0fe9a3..6da9380d 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -57,7 +57,7 @@ def add_image_slide(title, subtitle = nil,images) end def add_gallery_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::4d.new(presentation: self, title: title, subtitle: subtitle) + @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle) end def add_concept_slide(title, subtitle = nil,images) From 9bd19fa9cdd6c1a2af441d158407ecdb30508d63 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 18 Dec 2020 17:34:22 +0100 Subject: [PATCH 064/561] includes --- lib/powerpoint.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index ddcc5bd5..7bd3e590 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -2,6 +2,11 @@ require 'powerpoint/util' require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' +require 'powerpoint/slide/ranking' +require 'powerpoint/slide/collage' +require 'powerpoint/slide/concept' +require 'powerpoint/slide/gallery' +require 'powerpoint/slide/image' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' require 'powerpoint/slide/text_picture_split' From eae4a4d2cfd00d383ffdbdaf5e1c991b35a39259 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 15:25:22 +0100 Subject: [PATCH 065/561] fix gallery --- lib/powerpoint/slide/gallery.rb | 2 +- samples/pptx/sample.pptx | Bin 1502104 -> 1502150 bytes spec/ranking_spec.rb | 13 +++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 spec/ranking_spec.rb diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb index bf2fde92..754a049d 100644 --- a/lib/powerpoint/slide/gallery.rb +++ b/lib/powerpoint/slide/gallery.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class 4d + class Gallery include Powerpoint::Util attr_reader :title, :subtitle, :images diff --git a/samples/pptx/sample.pptx b/samples/pptx/sample.pptx index c0661f69461fb8d2fc9dff315a9a90a7c5671a73..721625b0b0caf454eb6e7149b2c9651b161f7b3a 100644 GIT binary patch delta 5247 zcmZu#2|QHa7oV|a7)!X;${w<7;YUUMN~svinyr#uvL!9^Q;H&~Q4f_wS}2rdQZ#6@ zZ$sAXvXrHy{=sg+Ui|=BHV-B4u)R46s@!q% zOi`8G;yy*U+``_pQqrm2qkGvHWx~8;VcAmpoOSj~T#hMq*JRY19(fU|2@Y+UIP^%P z)W<_^(Y>uhs+t)`zde88I(%UtBX@`C_ZsTb8%?xZOq-Omz5<*F;=fP`iX!Z5*;iDA zs*2sJ-RBV~E~#tqR7>Yd+Er$e@@mrqNJWjx=;9eNg<&F6^k$+(ZtMDbJ66?T#Ein<*|ofqb~aQjeoLS)-BK${_na6=?YsjBZA^}vZK3V1gaf6 zshf-&JdKmib2?kkm==0xcdNA9?^tc8S+_4O$@}IqkMcCTWme_k_0v!DR-6o4%0me@ zq42nI0s(m`tI}W|kCYA&eQm1xd-`?(?=(+E*)I{>p815N%xrf3CaZR@cQjz1htDO| zlJ1Kc9F7T|Ok25+Yq&@U<+{1ewom&eTZdDhIIQ?Ms@QWoceVK99ge~I2l5DWTFiom z!}psH^R!s><$Wq}U7OiaJM~Ymuu7Rz(~cA~>qAPfrwJ4dwra#s^K=(f zQBB1PQe()$2YOxht01Q}{Ed;7BP;1|R}JYjDyonC%k@Y(Hm5bA+O&0jD)Z>cLhARY zfdrGhc7lnI`iJwg-@XMKUJZNF6C_XV;4R+VX5MSn@wUfe)+<_R&tTk~wD)>7%54MD z^{)WZ(77(TN01-_33DEIu&K1|d1byNq+$cl4E~ACD%`z)71+T0vj*M}Tq*3LhF=2|_ z6I|$`AdjJQ#U*Li6mZ{#3U2HeN>bU717qyf9&+%bl|hKx+Tu72xRi_5t1E{r>ja#6 z8?|HEFlEo@W8u3w2n4>RP^nC{_wn!46a2v_?T%>p5$awUt{-jvMMx8v(Neby7@6m* zC#2;oj2ApsZtxjjdTV)mWAy=*4sW6SZMi@8Bc8u0G2?=onx!6`)#*e@xr$v&ldz~I#QXViBq&^`Qy2}(* z_nwPYRODhC-@2ovOoMz8N@_Fy9a@WfyO&NC# zIG$aq4SN4Pw2a2S#h87rG1S!vy!+r{Jw&@_>ZT$%rdZzM6cZN^a&${|#+}4Vhco`N z?9JM6{o(C@e570=tF6c@_DZReV*U=Lotos_t>St)YID2y*k_yflo@xi_RLJ`1L<*@2&{>+wrNOx_j z_VU23Jo{>OvO+7ew9h{MY<4r+^uFo--1x}!G<_3C?%+V)U>h%AIkiVGr5QW#dcOJl zrozb!Z0;$B83~6&RO(+%H;H{4wh5B<6PQ?cKV@ztbAmHsz`kV8(QnP`8&ckDZK%2* zZP}lz9e-SGnc#YiHrLovb>t|og>iWbbSNBXkx<{Sj3KhK4x0al9n9n(f?A*y;JR#A|oC<&0JLA|l zbG7^HKA(uz^<4WKxc0}5fA#i>Sfj_apCRg8KT~h($Xh)7qQZS?lJ3VG!6%c?G{%fS z5Alz0Uz=}{t1yz%AAi?MG9svCSgY8iAX-2xXZNGq!(YtS`5m|IZb?bLbnW9OZ>n)R zTOZ@zX07BeP7K}AbGMeh=*;`510!Q{IJ6Q9;kl$_A2(353`6}=hsS1*|D z>(te=F1a)Ep=yo#%lxiA?Y#bm!{0;Re!qIt%lSf-#5=<%zQQWLA3oonFbibd^09DRx?l<)*b zS^MjoaSDm&Mb422j-P+->$T3`P*CIJE0+T~KiKD&RPVysNkLeJ@^KzS21!K0|0@#I<9(D^v zV3SP$o(cZJIchd2!%vS@+!Ws^c(klvgq$k^0HF>6PP*59a2{JJ`fMI}iUa*N36tU= zP=E&m(gzE{RU8vp1emy6hZ0bZbIZy=CCgtBl53U4$S+3)L(Nv z_)S09)7{Tq)6$&Cwvzq7j|j@4l)&g?Tm-@nUHqE>y|EA>DGE9?mv5zz*@ z)()^69)b>o?T7-+%|iH(V6JY_LKNT^m=Z66AUDt9Jq3i=36|<;YoT9Z3kQ+zFycjk zK|By75M<}s2`OWCTDt$wjMj9|;RrN~hif(8%o4fZ0kp6|{<`}u1o2+#1X?oaMEtq} zF2vO6V*Mljoj?eK{;bny;DpWZ(@zhFmOv;r>5ZLmriu-5DPI>$D$@m}DMq-|u?sB5 zumPx4-xQZ-{lqd*snRA~`tMIE|7$4CHOHl!U$gvTJIBZZT^Ho+Yrv1WMRyKc5Gs@q zSTO0x`);Vqv_KkrfdV`kNQg!^YZKxcOH6~F6Igb$@DvuFLP8w+=Haba8Y>cF*fURK zjeCmi`OOnC6DjLqW&2zY8p%!^Wz-AAu-LIEvTSg#B{mECBW58Dy}#RM+2QsUeZSk^ zwa4wB*#BmaWy4(ubXKrrz`7&BoF)z-O8r0%dq<0l{$ocx$6W&5eS;QeIOX#v?zLNB z{)od8v~1qC9YU`41MCY2s})3F*qaY7gg900=DZalRmKvFfEK+wxsh@_o>NJ)e-z*>pA0XV#AWNd&{h0zj5+<<5e zvciHjSc>S6cn<G+1LRyb z0Do*TOQV0v>MruGbgf87KlL3|3F$TTCNb}FykJb8Oi{0OY~YV|DJ%uxWa z72N$Ijra=suY&!^%y X2f9w2@G?LkSi!$`xC2|EjzIVyz;00b delta 5126 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 Date: Mon, 21 Dec 2020 15:29:53 +0100 Subject: [PATCH 066/561] fix ranking --- lib/powerpoint/slide/ranking.rb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index 1a308184..0d503f91 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -13,7 +13,6 @@ class Ranking def initialize(options={}) require_arguments [:title, :subtitle, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} - @coords = default_coords unless @coords.any? images end @@ -27,19 +26,6 @@ def file_type File.extname(image_name).gsub('.', '') end - def default_coords - slide_width = pixle_to_pt(720) - default_width = pixle_to_pt(550) - - return {} unless dimensions = FastImage.size(image_path) - image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} - new_width = default_width < image_width ? default_width : image_width - ratio = new_width / image_width.to_f - new_height = (image_height.to_f * ratio).round - {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} - end - private :default_coords - def save_rel_xml(extract_path, index) render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end From 31bc17ab9134f0430a3f9e8f94d9f53b327b45f7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 15:36:03 +0100 Subject: [PATCH 067/561] fix ranking --- lib/powerpoint/slide/ranking.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index 0d503f91..b8c7aa7f 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -22,10 +22,6 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end - def file_type - File.extname(image_name).gsub('.', '') - end - def save_rel_xml(extract_path, index) render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end From 43fc3903cc98fb308abccf5781ef50453c05bf90 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 15:39:13 +0100 Subject: [PATCH 068/561] fix ranking --- lib/powerpoint/slide/ranking.rb | 3 ++- lib/powerpoint/util.rb | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index b8c7aa7f..4382480e 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -13,10 +13,11 @@ class Ranking def initialize(options={}) require_arguments [:title, :subtitle, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} - images + puts images.inspect end def save(extract_path, index) + copy_media(extract_path, @image_path) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index a9f731c2..957927ce 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -19,11 +19,6 @@ def read_template(filename) end def require_arguments(required_arguements, arguements) - puts '--required-------------------->' - puts required_arguements.inspect - puts '--required-------------------->' - puts arguements.keys.inspect - puts '---------------------->' raise ArgumentError unless required_arguements.all? {|required_key| arguements.keys.include? required_key} end From dafd5a9112f73a539dc4d03264d64c72a7ce6036 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 15:44:06 +0100 Subject: [PATCH 069/561] fix ranking --- lib/powerpoint/slide/ranking.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index 4382480e..46148d47 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -13,12 +13,14 @@ class Ranking def initialize(options={}) require_arguments [:title, :subtitle, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} - puts images.inspect + @images = images end def save(extract_path, index) + @images.each do |image| + copy_media(extract_path, image[0]) + end - copy_media(extract_path, @image_path) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end From 19c28e1c13171503df28669172ee703ca1d79848 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 16:03:34 +0100 Subject: [PATCH 070/561] fix ranking --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index c3dad1bd..ba368952 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -33,7 +33,7 @@ - <%= image['title'] %> + From d68927f7ed00f31fca58b76a3b82abe24318d4b0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 16:07:11 +0100 Subject: [PATCH 071/561] fix ranking --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index ba368952..ac5e2a68 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -33,7 +33,7 @@ - + <%= image %> From dcc34206fe3d562c6163830e53094323571b2e7b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 21 Dec 2020 16:12:56 +0100 Subject: [PATCH 072/561] fix ranking --- lib/powerpoint/views/ranking.xml.erb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index ac5e2a68..a0e6d495 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -61,19 +61,7 @@ - <% if coords.any? %> - - - - - - - - - - <% else %> - <% end %> <% end %> From 2019294d37cf301d4bdf7cb270dc631ef2621975 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 15:01:36 +0100 Subject: [PATCH 073/561] proper relation --- lib/powerpoint/views/ranking.xml.erb | 2 +- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index a0e6d495..eeb3ab97 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -50,7 +50,7 @@ - + diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index f7d5ed87..f2fb14fe 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - + <% end %> \ No newline at end of file From 583ce670ddbe100450cafc076bff12caabbe99e4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 15:11:21 +0100 Subject: [PATCH 074/561] proper relation --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index eeb3ab97..0f294915 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -33,7 +33,7 @@ - <%= image %> + hello From 526804e0ff54e481bb6cc988fb40e180c6131777 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 15:31:31 +0100 Subject: [PATCH 075/561] proper relation --- lib/powerpoint/views/ranking.xml.erb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 0f294915..1dbbfd8c 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -51,11 +51,6 @@ - - - - - From 0db122f0cc8baebc77187ae33124e8d63f7cb2e6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 15:37:19 +0100 Subject: [PATCH 076/561] remove title --- lib/powerpoint/views/ranking.xml.erb | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 1dbbfd8c..57232613 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -16,29 +16,6 @@ <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - - - - - hello - - - - - From fe49c8b06bd213f7774ac67c9bfe846430f216d0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 15:58:24 +0100 Subject: [PATCH 077/561] remove title --- lib/powerpoint/views/ranking.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 57232613..3b2965f1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -16,6 +16,7 @@ <% images.each_with_index do |image, index| %> + <% next if index > 0 %> From de608bf27b1a4da6ace0cfe6b32a1d21257605d5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 16:00:41 +0100 Subject: [PATCH 078/561] remove title --- lib/powerpoint/views/ranking.xml.erb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 3b2965f1..4ce64fdb 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -16,17 +16,7 @@ <% images.each_with_index do |image, index| %> - <% next if index > 0 %> - - - - - - - - - From 99efd515d8be105a9009f0793f4451f347b94f79 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 22 Dec 2020 16:06:53 +0100 Subject: [PATCH 079/561] remove title --- lib/powerpoint/views/ranking.xml.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 4ce64fdb..06b651f9 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -17,6 +17,15 @@ <% images.each_with_index do |image, index| %> + + + + + + + + + From 09f3f894508ce36a241f8d22a85fbe35662a74b8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 15:12:24 +0100 Subject: [PATCH 080/561] update template --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 06b651f9..43f0662e 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -18,7 +18,7 @@ <% images.each_with_index do |image, index| %> - + From 90b67fae062cb7cac1e7155bd2412029cb33d649 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 15:20:19 +0100 Subject: [PATCH 081/561] update template --- lib/powerpoint/views/ranking.xml.erb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 43f0662e..4ce64fdb 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -17,15 +17,6 @@ <% images.each_with_index do |image, index| %> - - - - - - - - - From dfab88b20f4a3c6e0b42b533a9bf534d25276ab2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 15:27:27 +0100 Subject: [PATCH 082/561] update template --- lib/powerpoint/views/ranking.xml.erb | 39 +++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 4ce64fdb..d1427197 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -15,10 +15,47 @@ + + + + + + + + + + + + + + + + + + <%= title %> + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + @@ -26,7 +63,7 @@ - <% end %> + <% end %> From 8bcdf571ba30f72f42de8f90fa4dc48c6a338091 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 15:58:16 +0100 Subject: [PATCH 083/561] image file --- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index f2fb14fe..a89531bd 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - + <% end %> \ No newline at end of file From f76762cd37a282a4a403caf3425184ded68a311f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:06:02 +0100 Subject: [PATCH 084/561] image file --- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index a89531bd..a16f9b0e 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From 2390684daa705a68d7e634f5614699fcc3d67cc5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:18:12 +0100 Subject: [PATCH 085/561] image file --- lib/powerpoint/views/ranking.xml.erb | 39 +--------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d1427197..4ce64fdb 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -15,47 +15,10 @@ - - - - - - - - - - - - - - - - - - <%= title %> - - - - - <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - @@ -63,7 +26,7 @@ - <% end %> + <% end %> From 6042cf7666ad9c05a2ad3e7449cc279f614ea48f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:23:59 +0100 Subject: [PATCH 086/561] image file revert --- lib/powerpoint/views/ranking.xml.erb | 39 +++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 4ce64fdb..d1427197 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -15,10 +15,47 @@ + + + + + + + + + + + + + + + + + + <%= title %> + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + @@ -26,7 +63,7 @@ - <% end %> + <% end %> From db6d597595a6de65eb8bb6ce7575944aca518b12 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:25:02 +0100 Subject: [PATCH 087/561] image file revert --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d1427197..2db35bbc 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -41,7 +41,7 @@ <% images.each_with_index do |image, index| %> - + From 391437349b1ad2ebc5c2c7849a6e9d753fc09d99 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:26:24 +0100 Subject: [PATCH 088/561] image file revert --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 2db35bbc..6cbdb895 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -41,7 +41,7 @@ <% images.each_with_index do |image, index| %> - + From a7da5930041a6e3c303b2fb72d28506d2033b7c5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 23 Dec 2020 16:31:05 +0100 Subject: [PATCH 089/561] coords --- lib/powerpoint/views/ranking.xml.erb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 6cbdb895..d2693fa7 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -61,7 +61,15 @@ - + + + + + + + + + <% end %> From 234d60dae85e86e0a982955eaa8b2c81e08cccf2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 10:29:24 +0100 Subject: [PATCH 090/561] coords --- lib/powerpoint/views/ranking.xml.erb | 34 ---------------------------- 1 file changed, 34 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d2693fa7..f7ce94f9 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,40 +38,6 @@ - <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% end %> From 918b6100eb415569e6a8ec9fe9644aa1f675e77e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 10:36:21 +0100 Subject: [PATCH 091/561] rels --- lib/powerpoint/views/ranking.xml.erb | 36 +++++++++++++++++++++++- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index f7ce94f9..a516b8f1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -3,7 +3,7 @@ - + @@ -38,6 +38,40 @@ + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% end %> diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index a16f9b0e..592e13cf 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From e6d3bc7895e6a51bfe0148d2bf01a94ee9a43a94 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 10:50:48 +0100 Subject: [PATCH 092/561] rels --- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index 592e13cf..a16f9b0e 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From ec01ecd0beae278f76428785cc075bb877b3b4da Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 12:18:47 +0100 Subject: [PATCH 093/561] rels --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index a516b8f1..d2693fa7 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -3,7 +3,7 @@ - + From f841742a81980105b06e4b64247f695d33a751e2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 12:41:25 +0100 Subject: [PATCH 094/561] remove coordinates --- lib/powerpoint/views/ranking.xml.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d2693fa7..169536fe 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -3,7 +3,7 @@ - + @@ -62,10 +62,6 @@ - - - - From 5704fb71c542909ba1e45602811dd3a9f4d7b445 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 15:35:02 +0100 Subject: [PATCH 095/561] fix error --- lib/powerpoint/views/ranking.xml.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 169536fe..a235f28b 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -61,11 +61,7 @@ - - - - - + <% end %> From 00727c2930010abf912cba6efa04dc6b924e0dd8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 15:53:36 +0100 Subject: [PATCH 096/561] coordinates --- lib/powerpoint/views/ranking.xml.erb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index a235f28b..bdbc37c2 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -61,7 +61,15 @@ - + + + + + + + + + <% end %> From c92c07d12f7ce5fcb00859f5851af1a7d1a3ec42 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 16:18:40 +0100 Subject: [PATCH 097/561] coordinates --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index bdbc37c2..1e1cbb7e 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,8 +63,8 @@ - - + + From 2b9bdde5050017362a7bf8c6f18ddf28ed3d9a63 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 17:26:51 +0100 Subject: [PATCH 098/561] votes --- lib/powerpoint/views/ranking.xml.erb | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 1e1cbb7e..e0fc5e2b 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -64,13 +64,39 @@ - + + + + + + + + + + + + + Position: X + + + + + + + + + + + Votes: X + + + <% end %> From ba9eebe5d005afa2e56407296e2a3c04725862f5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 21:29:02 +0100 Subject: [PATCH 099/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index e0fc5e2b..19764b09 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From 5aea17449b446ee95f9c3ab9b93d05d008bc21ab Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 21:35:29 +0100 Subject: [PATCH 100/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 19764b09..484a6080 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From c9086e7dbebd5afa2cd70aea20fbf1f213c517d7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 21:38:42 +0100 Subject: [PATCH 101/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 484a6080..5ebf3615 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From 2ac5d42f0d4cadcc5255fcdb581ff3806557da5a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 21:40:49 +0100 Subject: [PATCH 102/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 5ebf3615..5f3f8fd1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From e50e6f512307e746d54edc16340221773b67b5f2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 4 Jan 2021 21:43:04 +0100 Subject: [PATCH 103/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 5f3f8fd1..8b37a25e 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From 53e3b86445f88129493f3ae7190c2fe59fa5552c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 10:55:25 +0100 Subject: [PATCH 104/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 8b37a25e..f234cf21 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -63,7 +63,7 @@ - + From 663f02bafcd9259535ffe37f42c22398e6783e03 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 11:52:14 +0100 Subject: [PATCH 105/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index f234cf21..6ad4c604 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,6 +38,8 @@ + <% y_coords = 786449 %> + <% x_coords = 3049630 %> <% images.each_with_index do |image, index| %> @@ -63,7 +65,7 @@ - + From ae1cd9d98539593c889f3bc6a9809850e25c569f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:03:56 +0100 Subject: [PATCH 106/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 6ad4c604..16b3d1a7 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -65,7 +65,7 @@ - + From 25523ebf707362bcaf168ca01478309d6361d3d4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:07:36 +0100 Subject: [PATCH 107/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 16b3d1a7..cc745884 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,7 +38,7 @@ - <% y_coords = 786449 %> + <% y_coords = 7864490 %> <% x_coords = 3049630 %> <% images.each_with_index do |image, index| %> @@ -65,7 +65,7 @@ - + From 809435a35d43be1eb0b9c0047e07326e67f97a25 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:13:37 +0100 Subject: [PATCH 108/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index cc745884..342f3538 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -65,7 +65,7 @@ - + From a58acc2eff1c7af5ae3dd52bdd3a2131ee4fc3d4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:14:27 +0100 Subject: [PATCH 109/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 342f3538..d422f811 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -65,7 +65,7 @@ - + From baaf9e8d186a94ba33c1e9ac9d0effe1357e404e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:17:42 +0100 Subject: [PATCH 110/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d422f811..83b3fcf1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,7 +38,7 @@ - <% y_coords = 7864490 %> + <% y_coords = 3864490 %> <% x_coords = 3049630 %> <% images.each_with_index do |image, index| %> From 917a4b3f96dd215351553752568d4a50a3f7c04f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 12:20:43 +0100 Subject: [PATCH 111/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 83b3fcf1..b43ffab8 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,7 +38,7 @@ - <% y_coords = 3864490 %> + <% y_coords = 1864490 %> <% x_coords = 3049630 %> <% images.each_with_index do |image, index| %> @@ -65,7 +65,7 @@ - + From f55f4535a7146613a2704f8eefdaa6ab37115ab1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 13:05:58 +0100 Subject: [PATCH 112/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index b43ffab8..4be2acc0 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -65,7 +65,7 @@ - + From ca6d2b12cf0d688421c05b5ab84c0937a63004f9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 14:25:55 +0100 Subject: [PATCH 113/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 4be2acc0..d8a570c8 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -39,7 +39,7 @@ <% y_coords = 1864490 %> - <% x_coords = 3049630 %> + <% x_coords = 2049630 %> <% images.each_with_index do |image, index| %> From ec88e683e7377cd5f1dbeb00351eb83c6c4435b7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 14:28:49 +0100 Subject: [PATCH 114/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index d8a570c8..2f35029c 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,8 +38,8 @@ - <% y_coords = 1864490 %> - <% x_coords = 2049630 %> + <% y_coords = 2064490 %> + <% x_coords = 2549630 %> <% images.each_with_index do |image, index| %> @@ -82,7 +82,6 @@ - Position: X @@ -93,7 +92,6 @@ - Votes: X From f712db5e21058f9b6cff32ce7300e015cd0d23eb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 15:04:12 +0100 Subject: [PATCH 115/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 2f35029c..152feb8b 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,8 +38,8 @@ - <% y_coords = 2064490 %> - <% x_coords = 2549630 %> + <% y_coords = 2364490 %> + <% x_coords = 1549630 %> <% images.each_with_index do |image, index| %> @@ -65,7 +65,7 @@ - + From a032875ca185bd105fc2cb8f85729fd9ab52fd5b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 15:22:24 +0100 Subject: [PATCH 116/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 37 +++++++++------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 152feb8b..1564b114 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -38,8 +38,8 @@ - <% y_coords = 2364490 %> - <% x_coords = 1549630 %> + <% y_coords = 2664490 %> + <% x_coords = 2049630 %> <% images.each_with_index do |image, index| %> @@ -74,29 +74,16 @@ - - - - - - - - - - Position: X - - - - - - - - - - Votes: X - - - + + + + + + Votes + + + + <% end %> From d31a09622b0f42cb88d2637f841959fed4e95f78 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 15:26:32 +0100 Subject: [PATCH 117/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 1564b114..5a9d56f5 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -39,7 +39,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2049630 %> + <% x_coords = 2549630 %> <% images.each_with_index do |image, index| %> @@ -73,17 +73,19 @@ - - - - - - - Votes - - - - + + + + + + + + "Votes" + + + + + <% end %> From 2d18dd9702f8af8bc8266229ec836433bf8d9dc8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 15:42:54 +0100 Subject: [PATCH 118/561] index coords --- lib/powerpoint/views/ranking.xml.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 5a9d56f5..93113b12 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -39,7 +39,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2549630 %> + <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> @@ -72,8 +72,7 @@ - - + @@ -86,6 +85,8 @@ + + <% end %> From 5fd78af49e05007a6a7562ff403ada3eb7fd5473 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 15:51:07 +0100 Subject: [PATCH 119/561] text --- lib/powerpoint/views/ranking.xml.erb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 93113b12..8f14cbb2 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -79,7 +79,18 @@ - "Votes" + Position: <%= index +1 %> + + + + + + + + + + + Votes: <%= image[1] %> From e194191bdfc08e4d12fb971848f8bd6c4ecacaad Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 16:32:45 +0100 Subject: [PATCH 120/561] text --- lib/powerpoint/views/ranking.xml.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 8f14cbb2..ca9332dd 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -73,24 +73,26 @@ - + - Position: <%= index +1 %> + Votes: <%= image[1] %> + + - Votes: <%= image[1] %> + Position: <%= index +1 %> From db61fee2e40a3d8757719936bf26310cfc7907e6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 16:40:09 +0100 Subject: [PATCH 121/561] text --- lib/powerpoint/views/ranking.xml.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index ca9332dd..bddb8503 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -72,7 +72,8 @@ - + + @@ -98,8 +99,6 @@ - - <% end %> From 4be10c1f1538a1a38f8e2e4bba6e46e5106a5780 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 16:54:27 +0100 Subject: [PATCH 122/561] text --- lib/powerpoint/views/ranking.xml.erb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index bddb8503..43b4f7f1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -85,6 +85,15 @@ + + + + + + + + + @@ -98,6 +107,15 @@ + + + + + + + + + <% end %> From f7785682784aaa18d254d940f55f676988617006 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 17:02:55 +0100 Subject: [PATCH 123/561] text --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 43b4f7f1..b0cea256 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -87,7 +87,7 @@ - + @@ -109,7 +109,7 @@ - + From 34967e34bec7bb6f8205e7911c6ee754434b4c46 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 17:13:56 +0100 Subject: [PATCH 124/561] filename --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index b0cea256..c1fc4479 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -87,7 +87,7 @@ - + @@ -109,7 +109,7 @@ - + From 6c4c926b3ee62aa7a15fc4816b3e94cd66df2adc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 5 Jan 2021 17:17:35 +0100 Subject: [PATCH 125/561] filename --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index c1fc4479..376dd7cd 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -87,7 +87,7 @@ - + @@ -109,7 +109,7 @@ - + From 7faca6a0e6b401bce8305f7d96bed9be21761fdf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 6 Jan 2021 15:25:05 +0100 Subject: [PATCH 126/561] filename --- lib/powerpoint/slide/gallery.rb | 4 +- lib/powerpoint/views/gallery.xml.erb | 184 +++++++++++++++++++++++ lib/powerpoint/views/gallery_rel.xml.erb | 5 + lib/powerpoint/views/ranking.xml.erb | 4 +- 4 files changed, 193 insertions(+), 4 deletions(-) create mode 100644 lib/powerpoint/views/gallery.xml.erb create mode 100644 lib/powerpoint/views/gallery_rel.xml.erb diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb index 754a049d..f936b824 100644 --- a/lib/powerpoint/slide/gallery.rb +++ b/lib/powerpoint/slide/gallery.rb @@ -41,12 +41,12 @@ def default_coords private :default_coords def save_rel_xml(extract_path, index) - render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('gallery_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('gallery.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb new file mode 100644 index 00000000..82eb7b97 --- /dev/null +++ b/lib/powerpoint/views/gallery.xml.erb @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= Date.today %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/gallery_rel.xml.erb b/lib/powerpoint/views/gallery_rel.xml.erb new file mode 100644 index 00000000..2ccd226e --- /dev/null +++ b/lib/powerpoint/views/gallery_rel.xml.erb @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 376dd7cd..b54747c1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -80,7 +80,7 @@ - Votes: <%= image[1] %> + Position: <%= index +1 %> @@ -102,7 +102,7 @@ - Position: <%= index +1 %> + Votes: <%= image[1] %> From a70dfcbdb025f5884ffabe216bebb19f2a9d44e0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 6 Jan 2021 15:25:47 +0100 Subject: [PATCH 127/561] filename --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index b54747c1..48295597 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -87,7 +87,7 @@ - + @@ -109,7 +109,7 @@ - + From b50936fec85338fc426af96fdce01b4c6bb5da94 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 6 Jan 2021 15:50:38 +0100 Subject: [PATCH 128/561] gallery --- lib/powerpoint/presentation.rb | 1 + lib/powerpoint/slide/gallery.rb | 24 +++++------------------- lib/powerpoint/views/ranking.xml.erb | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 6da9380d..cd595655 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -57,6 +57,7 @@ def add_image_slide(title, subtitle = nil,images) end def add_gallery_slide(title, subtitle = nil,images) + puts 'add gallery' @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle) end diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb index f936b824..0d53c0e4 100644 --- a/lib/powerpoint/slide/gallery.rb +++ b/lib/powerpoint/slide/gallery.rb @@ -13,32 +13,18 @@ class Gallery def initialize(options={}) require_arguments [:title, :subtitle, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} - @coords = default_coords unless @coords.any? - images + @images = images end def save(extract_path, index) - copy_media(extract_path, @image_path) + @images.each do |image| + copy_media(extract_path, image[0]) + end + save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end - def file_type - File.extname(image_name).gsub('.', '') - end - - def default_coords - slide_width = pixle_to_pt(720) - default_width = pixle_to_pt(550) - - return {} unless dimensions = FastImage.size(image_path) - image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} - new_width = default_width < image_width ? default_width : image_width - ratio = new_width / image_width.to_f - new_height = (image_height.to_f * ratio).round - {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} - end - private :default_coords def save_rel_xml(extract_path, index) render_view('gallery_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 48295597..9401579b 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -87,7 +87,7 @@ - + From d3c32c7547ccae3ad9fdcf4bb1ac8f57691cbd59 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 7 Jan 2021 19:16:38 +0100 Subject: [PATCH 129/561] ranking template --- lib/powerpoint/views/ranking.xml.erb | 71 ++++++++++++---------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 9401579b..3f83ff1e 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -3,7 +3,7 @@ - + @@ -25,16 +25,20 @@ - + + + + + + - + <%= title %> - @@ -43,22 +47,20 @@ <% images.each_with_index do |image, index| %> - + + + + + + + - + - - - + - - - - - - - + @@ -74,48 +76,33 @@ - - - - - - - Position: <%= index +1 %> - - - - - - - - + + + - Votes: <%= image[1] %> + Position: <%= index +1 %> - - - - - - - - - - + + + + Votes: <%= image[1] %> + + + <% end %> From a338f02cc61b29ff01578247e0e97b88d2ede935 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 7 Jan 2021 19:46:00 +0100 Subject: [PATCH 130/561] ranking template --- lib/powerpoint/views/ranking.xml.erb | 65 ++++++++++++++++------------ 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 3f83ff1e..ea0e4bb8 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -76,34 +76,45 @@ - - - - - - - - - - - - - - - - - Position: <%= index +1 %> - - - - - - - Votes: <%= image[1] %> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Position: <%= index +1 %> + + + + + + + Votes: <%= image[1] %> + + - + <% end %> From d4081b33b570d0275a63783c68219f61b7f7c5ef Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 12:41:30 +0100 Subject: [PATCH 131/561] ranking template logo and subtitle --- lib/powerpoint/slide/ranking.rb | 6 +++-- lib/powerpoint/views/ranking.xml.erb | 33 +++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index 46148d47..ab43a3c2 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -8,10 +8,10 @@ module Slide class Ranking include Powerpoint::Util - attr_reader :title, :subtitle, :images + attr_reader :title, :subtitle,:logo,:company, :images def initialize(options={}) - require_arguments [:title, :subtitle, :images], options + require_arguments [:title, :subtitle, :logo, :company, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images end @@ -21,6 +21,8 @@ def save(extract_path, index) copy_media(extract_path, image[0]) end + copy_media(extract_path, logo) + save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index ea0e4bb8..44ee9334 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -42,12 +42,39 @@ + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + <% y_coords = 2664490 %> <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> - + @@ -67,8 +94,8 @@ - - + + From bd88ea158360e45478d9a6f75fb5d6272d267ecd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 13:15:57 +0100 Subject: [PATCH 132/561] ranking template logo and subtitle --- lib/powerpoint/presentation.rb | 5 ++--- lib/powerpoint/slide/ranking.rb | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index cd595655..257e06cf 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,8 +48,8 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_ranking_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Ranking.new(presentation: self, title: title, subtitle: subtitle, images: images) + def add_ranking_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) + @slides << Powerpoint::Slide::Ranking.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end def add_image_slide(title, subtitle = nil,images) @@ -57,7 +57,6 @@ def add_image_slide(title, subtitle = nil,images) end def add_gallery_slide(title, subtitle = nil,images) - puts 'add gallery' @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle) end diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/ranking.rb index ab43a3c2..1b8e3136 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/ranking.rb @@ -8,10 +8,10 @@ module Slide class Ranking include Powerpoint::Util - attr_reader :title, :subtitle,:logo,:company, :images + attr_reader :title, :subtitle,:subtitle_2, :logo, :images def initialize(options={}) - require_arguments [:title, :subtitle, :logo, :company, :images], options + require_arguments [:title, :subtitle,:subtitle_2,:logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images end From 41fe35ed8d5ac781a25e87d0f25a20db2756252b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 13:31:09 +0100 Subject: [PATCH 133/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 44ee9334..03abd5d7 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -69,6 +69,33 @@ + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + <% y_coords = 2664490 %> <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> From ec3dfd0d0a7e9f4c64c731e319b8db572dba148d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 13:40:08 +0100 Subject: [PATCH 134/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 03abd5d7..f00c6767 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -71,7 +71,7 @@ - + @@ -101,7 +101,7 @@ <% images.each_with_index do |image, index| %> - + From 79def858ff612a5a2993c72a6206519bef107c1c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 14:01:36 +0100 Subject: [PATCH 135/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 29 ++++++++++++++++++++++++ lib/powerpoint/views/ranking_rel.xml.erb | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index f00c6767..82ca5dc5 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -96,6 +96,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% y_coords = 2664490 %> <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index a16f9b0e..a8d9181a 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -1,7 +1,8 @@ + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From 4d86124e4fe46764d3e3153b173aeb377d6c2807 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 14:36:15 +0100 Subject: [PATCH 136/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 2 +- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 82ca5dc5..92b87379 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -143,7 +143,7 @@ - + diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index a8d9181a..df010f91 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -3,6 +3,6 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From c98c86f60065aa67d740508c8347806b12e780f9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 14:43:29 +0100 Subject: [PATCH 137/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 2 +- lib/powerpoint/views/ranking_rel.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 92b87379..59814dda 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -107,7 +107,7 @@ - + diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/ranking_rel.xml.erb index df010f91..c30e7724 100644 --- a/lib/powerpoint/views/ranking_rel.xml.erb +++ b/lib/powerpoint/views/ranking_rel.xml.erb @@ -1,7 +1,7 @@ - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> From d5083992eb07ce43c4c98139c10aea0c90009bda Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:03:01 +0100 Subject: [PATCH 138/561] ranking template logo and subtitle --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 59814dda..6b03ee49 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -121,7 +121,7 @@ - + From 2a00ee3aee24b9f492df9876dea02fdd21f6be53 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:11:49 +0100 Subject: [PATCH 139/561] assets and new ranking template --- lib/powerpoint/views/ranking.xml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 6b03ee49..50ab689c 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -82,13 +82,14 @@ - + + <%= subtitle_2 %> From 89fd475812a202157e3196aed84994f0fadc5e7d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:21:29 +0100 Subject: [PATCH 140/561] assets and new ranking template --- lib/powerpoint/views/ranking.xml.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 50ab689c..6b03ee49 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -82,14 +82,13 @@ - + - <%= subtitle_2 %> From c85fcfcb9ee751fbdfad60a2a7f50a7bd148b285 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:25:23 +0100 Subject: [PATCH 141/561] assets and new ranking template --- lib/powerpoint/views/ranking.xml.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 6b03ee49..191229a6 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -89,6 +89,7 @@ + <%= subtitle_2 %> @@ -120,8 +121,8 @@ - - + + From 3e600bfc49a273721eff01d68d8e8f38520ec84c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:39:51 +0100 Subject: [PATCH 142/561] font size --- lib/powerpoint/views/ranking.xml.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 191229a6..fe490306 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -27,7 +27,7 @@ - + @@ -35,8 +35,9 @@ + - + <%= title %> @@ -62,8 +63,9 @@ + - + <%= subtitle %> @@ -91,7 +93,7 @@ - + <%= subtitle_2 %> From e05084e305f11def95036120455248c7ace272f9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 15:49:42 +0100 Subject: [PATCH 143/561] font size --- lib/powerpoint/views/ranking.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index fe490306..c61f17f1 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -123,7 +123,7 @@ - + From d09a6faa576e0784880b19e526dcd6a9338b88e0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 16:02:22 +0100 Subject: [PATCH 144/561] font size --- lib/powerpoint/views/ranking.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index c61f17f1..2f31af83 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -27,7 +27,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -55,8 +55,8 @@ - - + + @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -123,7 +123,7 @@ - + From a93630a561d7112d0de9f09f37f1077af72bf69b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 16:22:46 +0100 Subject: [PATCH 145/561] font size --- lib/powerpoint/views/ranking.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 2f31af83..e2616bf2 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -27,7 +27,7 @@ - + @@ -55,8 +55,8 @@ - - + + From 14a9190ea37a60005d9b6529d6f3f6cd5e53e26c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 16:35:52 +0100 Subject: [PATCH 146/561] font size --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index e2616bf2..cc150f57 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -27,7 +27,7 @@ - + @@ -83,7 +83,7 @@ - + From 7b86221b8aea6ded62bd98956066078f7307e369 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 8 Jan 2021 16:43:07 +0100 Subject: [PATCH 147/561] font size --- lib/powerpoint/views/ranking.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index cc150f57..0ab4401c 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -27,7 +27,7 @@ - + @@ -83,7 +83,7 @@ - + From 10cbd309334256edeaf2a2d67f5e3ffec2bd2822 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 12:27:24 +0100 Subject: [PATCH 148/561] remove unneccesary slides --- lib/powerpoint/presentation.rb | 12 -- lib/powerpoint/views/4d.xml.erb | 89 ----------- lib/powerpoint/views/4d_rel.xml.erb | 7 - lib/powerpoint/views/collage.xml.erb | 89 ----------- lib/powerpoint/views/collage_rel.xml.erb | 7 - lib/powerpoint/views/concept.xml.erb | 89 ----------- lib/powerpoint/views/concept_rel.xml.erb | 7 - lib/powerpoint/views/gallery.xml.erb | 184 ----------------------- lib/powerpoint/views/gallery_rel.xml.erb | 5 - lib/powerpoint/views/ranking.xml.erb | 4 +- 10 files changed, 2 insertions(+), 491 deletions(-) delete mode 100644 lib/powerpoint/views/4d.xml.erb delete mode 100644 lib/powerpoint/views/4d_rel.xml.erb delete mode 100644 lib/powerpoint/views/collage.xml.erb delete mode 100644 lib/powerpoint/views/collage_rel.xml.erb delete mode 100644 lib/powerpoint/views/concept.xml.erb delete mode 100644 lib/powerpoint/views/concept_rel.xml.erb delete mode 100644 lib/powerpoint/views/gallery.xml.erb delete mode 100644 lib/powerpoint/views/gallery_rel.xml.erb diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 257e06cf..97128c91 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,18 +56,6 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_gallery_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle) - end - - def add_concept_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle) - end - - def add_collage_slide(title, subtitle = nil,images) - @slides << Powerpoint::Slide::Collage.new(presentation: self, title: title, subtitle: subtitle) - end - def save(path) Dir.mktmpdir do |dir| extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}" diff --git a/lib/powerpoint/views/4d.xml.erb b/lib/powerpoint/views/4d.xml.erb deleted file mode 100644 index c3dad1bd..00000000 --- a/lib/powerpoint/views/4d.xml.erb +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - - - - - <%= image['title'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if coords.any? %> - - - - - - - - - - <% else %> - - <% end %> - - <% end %> - - - - - - - - - - - \ No newline at end of file diff --git a/lib/powerpoint/views/4d_rel.xml.erb b/lib/powerpoint/views/4d_rel.xml.erb deleted file mode 100644 index f7d5ed87..00000000 --- a/lib/powerpoint/views/4d_rel.xml.erb +++ /dev/null @@ -1,7 +0,0 @@ - - - - <% images.each_with_index do |image, index| %> - - <% end %> - \ No newline at end of file diff --git a/lib/powerpoint/views/collage.xml.erb b/lib/powerpoint/views/collage.xml.erb deleted file mode 100644 index c3dad1bd..00000000 --- a/lib/powerpoint/views/collage.xml.erb +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - - - - - <%= image['title'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if coords.any? %> - - - - - - - - - - <% else %> - - <% end %> - - <% end %> - - - - - - - - - - - \ No newline at end of file diff --git a/lib/powerpoint/views/collage_rel.xml.erb b/lib/powerpoint/views/collage_rel.xml.erb deleted file mode 100644 index f7d5ed87..00000000 --- a/lib/powerpoint/views/collage_rel.xml.erb +++ /dev/null @@ -1,7 +0,0 @@ - - - - <% images.each_with_index do |image, index| %> - - <% end %> - \ No newline at end of file diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb deleted file mode 100644 index c3dad1bd..00000000 --- a/lib/powerpoint/views/concept.xml.erb +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - <% images.each_with_index do |image, index| %> - - - - - - - - - - - - - - - - - - <%= image['title'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if coords.any? %> - - - - - - - - - - <% else %> - - <% end %> - - <% end %> - - - - - - - - - - - \ No newline at end of file diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb deleted file mode 100644 index f7d5ed87..00000000 --- a/lib/powerpoint/views/concept_rel.xml.erb +++ /dev/null @@ -1,7 +0,0 @@ - - - - <% images.each_with_index do |image, index| %> - - <% end %> - \ No newline at end of file diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb deleted file mode 100644 index 82eb7b97..00000000 --- a/lib/powerpoint/views/gallery.xml.erb +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= title %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= subtitle %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= subtitle_2 %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= Date.today %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if coords.any? %> - - - - - - - - - - <% else %> - - <% end %> - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/powerpoint/views/gallery_rel.xml.erb b/lib/powerpoint/views/gallery_rel.xml.erb deleted file mode 100644 index 2ccd226e..00000000 --- a/lib/powerpoint/views/gallery_rel.xml.erb +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/ranking.xml.erb index 0ab4401c..8d77fa66 100644 --- a/lib/powerpoint/views/ranking.xml.erb +++ b/lib/powerpoint/views/ranking.xml.erb @@ -83,7 +83,7 @@ - + @@ -123,7 +123,7 @@ - + From 523777249e2506ddbc6bb721e8b440cce315aadd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 12:30:56 +0100 Subject: [PATCH 149/561] remove unneccesary slides --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/slide/collage.rb | 54 ------------------- lib/powerpoint/slide/concept.rb | 54 ------------------- lib/powerpoint/slide/gallery.rb | 40 -------------- .../slide/{ranking.rb => multiple_image.rb} | 2 +- ...ranking.xml.erb => multiple_image.xml.erb} | 0 ...rel.xml.erb => multiple_image_rel.xml.erb} | 0 7 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 lib/powerpoint/slide/collage.rb delete mode 100644 lib/powerpoint/slide/concept.rb delete mode 100644 lib/powerpoint/slide/gallery.rb rename lib/powerpoint/slide/{ranking.rb => multiple_image.rb} (94%) rename lib/powerpoint/views/{ranking.xml.erb => multiple_image.xml.erb} (100%) rename lib/powerpoint/views/{ranking_rel.xml.erb => multiple_image_rel.xml.erb} (100%) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 97128c91..53bce727 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,7 +49,7 @@ def add_picture_description_slide(title, image_path, content = []) end def add_ranking_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::Ranking.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end def add_image_slide(title, subtitle = nil,images) diff --git a/lib/powerpoint/slide/collage.rb b/lib/powerpoint/slide/collage.rb deleted file mode 100644 index 43910012..00000000 --- a/lib/powerpoint/slide/collage.rb +++ /dev/null @@ -1,54 +0,0 @@ -require 'zip/filesystem' -require 'fileutils' -require 'fastimage' -require 'erb' - -module Powerpoint - module Slide - class Collage - include Powerpoint::Util - - attr_reader :title, :subtitle, :images - - def initialize(options={}) - require_arguments [:title, :subtitle, :images], options - options.each {|k, v| instance_variable_set("@#{k}", v)} - @coords = default_coords unless @coords.any? - images - end - - def save(extract_path, index) - copy_media(extract_path, @image_path) - save_rel_xml(extract_path, index) - save_slide_xml(extract_path, index) - end - - def file_type - File.extname(image_name).gsub('.', '') - end - - def default_coords - slide_width = pixle_to_pt(720) - default_width = pixle_to_pt(550) - - return {} unless dimensions = FastImage.size(image_path) - image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} - new_width = default_width < image_width ? default_width : image_width - ratio = new_width / image_width.to_f - new_height = (image_height.to_f * ratio).round - {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} - end - private :default_coords - - def save_rel_xml(extract_path, index) - render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) - end - private :save_rel_xml - - def save_slide_xml(extract_path, index) - render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") - end - private :save_slide_xml - end - end -end \ No newline at end of file diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb deleted file mode 100644 index 15f36acb..00000000 --- a/lib/powerpoint/slide/concept.rb +++ /dev/null @@ -1,54 +0,0 @@ -require 'zip/filesystem' -require 'fileutils' -require 'fastimage' -require 'erb' - -module Powerpoint - module Slide - class Concept - include Powerpoint::Util - - attr_reader :title, :subtitle, :images - - def initialize(options={}) - require_arguments [:title, :subtitle, :images], options - options.each {|k, v| instance_variable_set("@#{k}", v)} - @coords = default_coords unless @coords.any? - images - end - - def save(extract_path, index) - copy_media(extract_path, @image_path) - save_rel_xml(extract_path, index) - save_slide_xml(extract_path, index) - end - - def file_type - File.extname(image_name).gsub('.', '') - end - - def default_coords - slide_width = pixle_to_pt(720) - default_width = pixle_to_pt(550) - - return {} unless dimensions = FastImage.size(image_path) - image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} - new_width = default_width < image_width ? default_width : image_width - ratio = new_width / image_width.to_f - new_height = (image_height.to_f * ratio).round - {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} - end - private :default_coords - - def save_rel_xml(extract_path, index) - render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) - end - private :save_rel_xml - - def save_slide_xml(extract_path, index) - render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") - end - private :save_slide_xml - end - end -end \ No newline at end of file diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb deleted file mode 100644 index 0d53c0e4..00000000 --- a/lib/powerpoint/slide/gallery.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'zip/filesystem' -require 'fileutils' -require 'fastimage' -require 'erb' - -module Powerpoint - module Slide - class Gallery - include Powerpoint::Util - - attr_reader :title, :subtitle, :images - - def initialize(options={}) - require_arguments [:title, :subtitle, :images], options - options.each {|k, v| instance_variable_set("@#{k}", v)} - @images = images - end - - def save(extract_path, index) - @images.each do |image| - copy_media(extract_path, image[0]) - end - - save_rel_xml(extract_path, index) - save_slide_xml(extract_path, index) - end - - - def save_rel_xml(extract_path, index) - render_view('gallery_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) - end - private :save_rel_xml - - def save_slide_xml(extract_path, index) - render_view('gallery.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") - end - private :save_slide_xml - end - end -end \ No newline at end of file diff --git a/lib/powerpoint/slide/ranking.rb b/lib/powerpoint/slide/multiple_image.rb similarity index 94% rename from lib/powerpoint/slide/ranking.rb rename to lib/powerpoint/slide/multiple_image.rb index 1b8e3136..9a2ea1e4 100644 --- a/lib/powerpoint/slide/ranking.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Ranking + class MultipleImage include Powerpoint::Util attr_reader :title, :subtitle,:subtitle_2, :logo, :images diff --git a/lib/powerpoint/views/ranking.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb similarity index 100% rename from lib/powerpoint/views/ranking.xml.erb rename to lib/powerpoint/views/multiple_image.xml.erb diff --git a/lib/powerpoint/views/ranking_rel.xml.erb b/lib/powerpoint/views/multiple_image_rel.xml.erb similarity index 100% rename from lib/powerpoint/views/ranking_rel.xml.erb rename to lib/powerpoint/views/multiple_image_rel.xml.erb From 427b4fb2e840db55f5167c862ff1163a53b2aeec Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 12:53:07 +0100 Subject: [PATCH 150/561] remove unneccesary slides --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 53bce727..f9704311 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,7 +48,7 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_ranking_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) + def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end From e525850e44bb859212995c0e66fcd3ce9d2f5636 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 13:55:19 +0100 Subject: [PATCH 151/561] remove unneccesary slides --- lib/powerpoint/slide/image.rb | 4 ++-- lib/powerpoint/slide/multiple_image.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/image.rb b/lib/powerpoint/slide/image.rb index 6f25c7e0..1ba3f557 100644 --- a/lib/powerpoint/slide/image.rb +++ b/lib/powerpoint/slide/image.rb @@ -41,12 +41,12 @@ def default_coords private :default_coords def save_rel_xml(extract_path, index) - render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('image_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('image.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 9a2ea1e4..5780e313 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -28,12 +28,12 @@ def save(extract_path, index) end def save_rel_xml(extract_path, index) - render_view('ranking_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('multiple_image_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('ranking.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('multiple_image.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end From 89654bbd86ccd38f8e9ea04b0167187269112f8d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 14:06:26 +0100 Subject: [PATCH 152/561] remove unneccesary slides --- lib/powerpoint.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 7bd3e590..cc08afd3 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -2,10 +2,7 @@ require 'powerpoint/util' require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' -require 'powerpoint/slide/ranking' -require 'powerpoint/slide/collage' -require 'powerpoint/slide/concept' -require 'powerpoint/slide/gallery' +require 'powerpoint/slide/multiple_image' require 'powerpoint/slide/image' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' From b4ee41876b76c806a8f6d9dc43782e701cc0488b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 14:26:17 +0100 Subject: [PATCH 153/561] remove unneccesary slides --- lib/powerpoint/views/multiple_image.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 8d77fa66..2cb61375 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -27,8 +27,8 @@ - - + + @@ -83,7 +83,7 @@ - + From 6047a96646d476cac6c239b39b7093346e9ee9f2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 16:40:28 +0100 Subject: [PATCH 154/561] change front template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 82eb7b97..845fb922 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -33,7 +33,12 @@ - + + + + + + From af96fab886af279093a6b3c66a4fbed344a349b1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 17:26:56 +0100 Subject: [PATCH 155/561] change front template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 845fb922..90c5b531 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + @@ -43,6 +43,7 @@ + <%= title %> @@ -94,11 +95,17 @@ - + + + + + + + <%= subtitle_2 %> From e0b7ba231b118a4b0ea59c577fe26a36a10d8882 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 18:29:58 +0100 Subject: [PATCH 156/561] change front template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 90c5b531..f33f70e7 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -129,11 +129,17 @@ - + + + + + + + <%= Date.today %> From ee544f9e9228d308fe24a355ca8cb83ec5e3cfcd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 11 Jan 2021 18:44:27 +0100 Subject: [PATCH 157/561] change front template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index f33f70e7..8b16495c 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -67,11 +67,17 @@ - + + + + + + + <%= subtitle %> From 9a4ceb6a2c1e476fedcfd107910cd4eb2ddc343a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 17:06:42 +0100 Subject: [PATCH 158/561] 1st template --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/extended_intro.rb | 6 ++++-- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index f9704311..721a59f6 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -22,9 +22,9 @@ def add_intro(title, subtitile = nil) end end - def add_extended_intro(title, image_path, subtitle = nil,subtitle_2 = nil, coords = {}) + def add_extended_intro(title, image_path, image_path_2 subtitle = nil,subtitle_2 = nil, coords = {}) existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] - slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path,subtitle_2: subtitle_2, coords: coords) + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path, image_path: image_path_2, subtitle_2: subtitle_2, coords: coords) if existing_intro_slide @slides[@slides.index(existing_intro_slide)] = slide else diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index a85bce9d..17910c77 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -8,17 +8,19 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path + attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path, :image_path_2 def initialize(options={}) - require_arguments [:title, :subtitle, :image_path, :subtitle_2], options + require_arguments [:title, :subtitle, :image_path,:image_path_2, :subtitle_2], options options.each {|k, v| instance_variable_set("@#{k}", v)} @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) + @image_name_2 = File.basename(@image_path_2) end def save(extract_path, index) copy_media(extract_path, @image_path) + copy_media(extract_path, @image_path_2) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 2ccd226e..7a6b9fb8 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -2,4 +2,5 @@ + \ No newline at end of file From 00f1f39f9775961cd0eec794d9721a3bc47bb81e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 17:31:31 +0100 Subject: [PATCH 159/561] 1st template --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 721a59f6..f2b1d22d 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -22,7 +22,7 @@ def add_intro(title, subtitile = nil) end end - def add_extended_intro(title, image_path, image_path_2 subtitle = nil,subtitle_2 = nil, coords = {}) + def add_extended_intro(title, image_path, image_path_2,subtitle = nil,subtitle_2 = nil, coords = {}) existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path, image_path: image_path_2, subtitle_2: subtitle_2, coords: coords) if existing_intro_slide From f8954b586830f92f22d7f1954f0ae127911ca672 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 17:37:03 +0100 Subject: [PATCH 160/561] 1st template --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/slide/extended_intro.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index f2b1d22d..3f292766 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -24,7 +24,7 @@ def add_intro(title, subtitile = nil) def add_extended_intro(title, image_path, image_path_2,subtitle = nil,subtitle_2 = nil, coords = {}) existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::ExtendedIntro}[0] - slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path, image_path: image_path_2, subtitle_2: subtitle_2, coords: coords) + slide = Powerpoint::Slide::ExtendedIntro.new(presentation: self, title: title, subtitle: subtitle, image_path: image_path, image_path_2: image_path_2, subtitle_2: subtitle_2, coords: coords) if existing_intro_slide @slides[@slides.index(existing_intro_slide)] = slide else diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 17910c77..e6c63300 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -11,7 +11,7 @@ class ExtendedIntro attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path, :image_path_2 def initialize(options={}) - require_arguments [:title, :subtitle, :image_path,:image_path_2, :subtitle_2], options + require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2], options options.each {|k, v| instance_variable_set("@#{k}", v)} @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) From 21dbc2c1c490fa0c476fcc919753555de8926e65 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 17:49:09 +0100 Subject: [PATCH 161/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 7a6b9fb8..34ac8af7 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -2,5 +2,5 @@ - + \ No newline at end of file From e0bcb16b572e6edb683a8705ad74f3f5423ddec8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 18:05:20 +0100 Subject: [PATCH 162/561] 1st template --- .../views/extended_intro_slide.xml.erb | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 8b16495c..4fa76322 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -161,7 +161,7 @@ - + @@ -195,6 +195,42 @@ <% end %> + + + + + + + + + + + + + + + + + + + + + + + <% if coords.any? %> + + + + + + + + + + <% else %> + + <% end %> + From e99d466cfd65c94c7fc2b7e59ee7f8e3fe021e5a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 18:13:49 +0100 Subject: [PATCH 163/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 4fa76322..191e7ab4 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -170,7 +170,7 @@ - + From 1d4a3be1f1e9aee480a67dd9722bd2b79d22975a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 18:27:00 +0100 Subject: [PATCH 164/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 2 +- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index e6c63300..e21016a5 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -8,7 +8,7 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :image_name, :coords, :image_path, :image_path_2 + attr_reader :title, :subtitle, :subtitle_2,:coords, :image_path, :image_path_2 def initialize(options={}) require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2], options diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 191e7ab4..4fa76322 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -170,7 +170,7 @@ - + From 4ca43539235f4433c31185016fcb5ac823737192 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 18:44:33 +0100 Subject: [PATCH 165/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index e21016a5..009b1786 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -26,7 +26,7 @@ def save(extract_path, index) end def file_type - File.extname(image_name).gsub('.', '') + File.extname(@image_name).gsub('.', '') end def default_coords From 7eb3cfa1acc18135336d0ca16be88785ccf484c1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 12 Jan 2021 18:55:47 +0100 Subject: [PATCH 166/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 34ac8af7..07f44f77 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1,6 +1,6 @@ - - + + \ No newline at end of file From 56cad43dd21ada1ab96639450d26798f49ad5b33 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 10:06:52 +0100 Subject: [PATCH 167/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 009b1786..ee24be4d 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -25,9 +25,6 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end - def file_type - File.extname(@image_name).gsub('.', '') - end def default_coords slide_width = pixle_to_pt(720) From cd3bbbc01da7d06f430437431236d3b534dec08d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 10:20:30 +0100 Subject: [PATCH 168/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index ee24be4d..3e00f01b 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -8,7 +8,7 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2,:coords, :image_path, :image_path_2 + attr_reader :title, :subtitle, :subtitle_2, :coords, :image_path, :image_path_2 def initialize(options={}) require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2], options @@ -25,6 +25,9 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end + def file_type + File.extname(image_name).gsub('.', '') + end def default_coords slide_width = pixle_to_pt(720) From d0cae81465f4c483c0da8d5d7099f43eaa16c1d6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 10:43:01 +0100 Subject: [PATCH 169/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 3e00f01b..dcac8817 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -8,7 +8,7 @@ module Slide class ExtendedIntro include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :coords, :image_path, :image_path_2 + attr_reader :title, :subtitle, :subtitle_2, :coords, :image_path, :image_path_2, :image_name def initialize(options={}) require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2], options From bf916f22da9b97c78f1d58e5d18acc67e8031d3e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 10:58:11 +0100 Subject: [PATCH 170/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 1 + lib/powerpoint/views/extended_intro_slide.xml.erb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index dcac8817..57ce3d8a 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -16,6 +16,7 @@ def initialize(options={}) @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) + puts @image_name_2 end def save(extract_path, index) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 4fa76322..b67666b6 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -69,8 +69,8 @@ - - + + @@ -79,7 +79,7 @@ - + <%= subtitle %> From 81abf78c8813688e939c35e13ee11ecf33541e6b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 11:16:18 +0100 Subject: [PATCH 171/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index b67666b6..b5deaf83 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -69,8 +69,8 @@ - - + + @@ -137,8 +137,8 @@ - - + + From 8a5f4f30944b6f5cbe4c0ee9201f5b2d2845750a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 11:23:08 +0100 Subject: [PATCH 172/561] 1st template --- .../views/extended_intro_slide.xml.erb | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index b5deaf83..de0de0e4 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -181,19 +181,12 @@ - <% if coords.any? %> - - + + - - - - <% else %> - - <% end %> @@ -202,7 +195,7 @@ - + @@ -217,19 +210,12 @@ - <% if coords.any? %> - - + + - - - - <% else %> - - <% end %> From 9b548d7720b3821d812c8028ad047710e37d06b4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 12:17:49 +0100 Subject: [PATCH 173/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 1 - lib/powerpoint/views/extended_intro_slide.xml.erb | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 57ce3d8a..dcac8817 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -16,7 +16,6 @@ def initialize(options={}) @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) - puts @image_name_2 end def save(extract_path, index) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index de0de0e4..d1b3cbc5 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -69,7 +69,7 @@ - + @@ -79,7 +79,7 @@ - + <%= subtitle %> @@ -103,7 +103,7 @@ - + @@ -113,7 +113,7 @@ - + <%= subtitle_2 %> @@ -147,7 +147,7 @@ - + <%= Date.today %> From 769dab5bfba1a766753278d8af7f506cef81719e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 12:31:38 +0100 Subject: [PATCH 174/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index d1b3cbc5..ff609de5 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -138,7 +138,7 @@ - + From 2fd7c44177f2f2cf5e315c907d61ec29821fa5c5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 12:32:43 +0100 Subject: [PATCH 175/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index ff609de5..9c33d60f 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -190,7 +190,7 @@ - + From e1ddb547be9a250a77befffb34141f3a7c664b84 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 12:59:33 +0100 Subject: [PATCH 176/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9c33d60f..a42a14b1 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -184,7 +184,7 @@ - + From 39299f6e8f0a1689f0d629797775f43ae3ff9698 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 13:30:25 +0100 Subject: [PATCH 177/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a42a14b1..f84bf3c2 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -184,7 +184,7 @@ - + From dfaafb76a830f2561e297be19197fae837b86fff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 13:32:24 +0100 Subject: [PATCH 178/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index f84bf3c2..3e9e9cc9 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,7 +35,7 @@ - + @@ -69,7 +69,7 @@ - + From f70cd24e91d5760c0d4ad53d1c81b1c1ba915b3f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 13:45:40 +0100 Subject: [PATCH 179/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 3e9e9cc9..0effedfa 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -40,7 +40,7 @@ - + @@ -48,12 +48,11 @@ <%= title %> - - + @@ -74,7 +73,7 @@ - + @@ -82,7 +81,6 @@ <%= subtitle %> - @@ -108,7 +106,7 @@ - + @@ -116,7 +114,6 @@ <%= subtitle_2 %> - From a4ad1b1e3b327899c4106b7e5b7198e99e01eb10 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 14:03:57 +0100 Subject: [PATCH 180/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 0effedfa..e4129e64 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -135,11 +135,11 @@ - + - + From c8096d6015030b28e764f07693b7581f7453a5ef Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 15:53:57 +0100 Subject: [PATCH 181/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index dcac8817..eb40353b 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -43,7 +43,7 @@ def default_coords private :default_coords def save_rel_xml(extract_path, index) - render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('extended_intro_slide.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml From 6ca1bdba0440d3d9666ba057ea39ae124b942754 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 15:57:57 +0100 Subject: [PATCH 182/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 07f44f77..34ac8af7 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1,6 +1,6 @@ - - + + \ No newline at end of file From f072f36821481d1274a32b202f2f7917b79d8949 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 16:00:51 +0100 Subject: [PATCH 183/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 19 +------------------ .../views/extended_intro_slide_rel.xml.erb | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index eb40353b..4cfee4e6 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -25,25 +25,8 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end - def file_type - File.extname(image_name).gsub('.', '') - end - - def default_coords - slide_width = pixle_to_pt(720) - default_width = pixle_to_pt(550) - - return {} unless dimensions = FastImage.size(image_path) - image_width, image_height = dimensions.map {|d| pixle_to_pt(d)} - new_width = default_width < image_width ? default_width : image_width - ratio = new_width / image_width.to_f - new_height = (image_height.to_f * ratio).round - {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height} - end - private :default_coords - def save_rel_xml(extract_path, index) - render_view('extended_intro_slide.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('extended_intro_slide_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 34ac8af7..07f44f77 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1,6 +1,6 @@ - - + + \ No newline at end of file From 64b31796ce84338b2038dad0ca4d1d8f93f514d7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 16:42:41 +0100 Subject: [PATCH 184/561] 1st template --- lib/powerpoint/slide/extended_intro.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/powerpoint/slide/extended_intro.rb b/lib/powerpoint/slide/extended_intro.rb index 4cfee4e6..80e5d2d1 100644 --- a/lib/powerpoint/slide/extended_intro.rb +++ b/lib/powerpoint/slide/extended_intro.rb @@ -13,7 +13,6 @@ class ExtendedIntro def initialize(options={}) require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2], options options.each {|k, v| instance_variable_set("@#{k}", v)} - @coords = default_coords unless @coords.any? @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) end From f8020752b5e50c394f415c397ef84484ef2f1a9f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 16:46:59 +0100 Subject: [PATCH 185/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index e4129e64..39e2927b 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -209,8 +209,8 @@ - - + + From 633650a670da12f8bcbf307356a388b3021784df Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 13 Jan 2021 17:04:08 +0100 Subject: [PATCH 186/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 39e2927b..01ec35f0 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -209,8 +209,8 @@ - - + + From 56b01451f10c74a7d9e481c73ac72f99a6f91320 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 13:29:20 +0100 Subject: [PATCH 187/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 01ec35f0..14a312be 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + @@ -209,8 +209,8 @@ - - + + From 46dab16c3c855e87c1f41a89924e8b174d99f284 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 14:04:59 +0100 Subject: [PATCH 188/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 14a312be..c1b2e5ed 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + @@ -180,8 +180,8 @@ - - + + From 262878ff8c11626bbc344b0e230a1ec90cf4d41e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 14:38:28 +0100 Subject: [PATCH 189/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index c1b2e5ed..511e224f 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -180,8 +180,8 @@ - - + + From 536fc7d9d2e5e7f60d3499c706892b970cc75584 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 14:43:04 +0100 Subject: [PATCH 190/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 511e224f..3368750b 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -210,7 +210,7 @@ - + From 00f049b4a2e26d52e58e5d69864038d7013d3280 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 15:04:57 +0100 Subject: [PATCH 191/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 07f44f77..e26ed921 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file From 2592ac29efc092dfa32a72525802ce19c53c0b6f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 15:32:27 +0100 Subject: [PATCH 192/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 3368750b..5ba1e4f3 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + @@ -209,7 +209,7 @@ - + diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index e26ed921..e8be1980 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1 +1,5 @@ - \ No newline at end of file + + + + + \ No newline at end of file From 3a667a025ee727fe44d6b65f4a2928483df8a7c6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 16:08:33 +0100 Subject: [PATCH 193/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5ba1e4f3..a99e1eb9 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + From c206d7d73701bc3a069eeda3fa097b9dfb2f306f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 16:39:27 +0100 Subject: [PATCH 194/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a99e1eb9..fed22be2 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + @@ -209,7 +209,7 @@ - + From 08293cc4d4435d4320a138029d15e3ab8bba7b5e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 16:58:12 +0100 Subject: [PATCH 195/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index fed22be2..dfec33e0 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -134,7 +134,7 @@ - + @@ -209,7 +209,7 @@ - + From 020492adc5e192ef09d9c906f71f07c249283cae Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 14 Jan 2021 17:16:19 +0100 Subject: [PATCH 196/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index dfec33e0..5a54360e 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -101,7 +101,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -180,8 +180,8 @@ - - + + From 363e95d4c44c573c6d6baf6f5a43eab4c2c97457 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 15 Jan 2021 15:35:33 +0100 Subject: [PATCH 197/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5a54360e..1d414108 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -30,7 +30,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -147,7 +147,6 @@ <%= Date.today %> - @@ -163,7 +162,7 @@ - + @@ -192,7 +191,7 @@ - + From 7ff02eee3b5fe28d46f8b5758b4ab63d4d6165d5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 15 Jan 2021 16:14:25 +0100 Subject: [PATCH 198/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 1d414108..9674648f 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -30,7 +30,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -147,6 +147,7 @@ <%= Date.today %> + @@ -162,7 +163,7 @@ - + @@ -179,7 +180,7 @@ - + @@ -191,7 +192,7 @@ - + From 3ab155e87cd6dadab2f6cf747dfa2fd96c83f9ce Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 15 Jan 2021 16:28:22 +0100 Subject: [PATCH 199/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9674648f..e43f3cac 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -111,7 +111,7 @@ - + <%= subtitle_2 %> @@ -144,7 +144,7 @@ - + <%= Date.today %> From 48e727b6a9280de746c7f02194e118905ad56263 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 15 Jan 2021 16:34:50 +0100 Subject: [PATCH 200/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index e43f3cac..b8c00c06 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -96,7 +96,7 @@ - + @@ -111,7 +111,7 @@ - + <%= subtitle_2 %> @@ -129,7 +129,7 @@ - + @@ -144,7 +144,7 @@ - + <%= Date.today %> From 87ac3ad45e32bf5576d565208a812af358c697e7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 15 Jan 2021 17:04:10 +0100 Subject: [PATCH 201/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index b8c00c06..7c9d5c54 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -25,7 +25,7 @@ - + From 1dff66a196087a7d14f5d645118077ac477ae116 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 18 Jan 2021 16:17:15 +0100 Subject: [PATCH 202/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 7c9d5c54..f80a4a89 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -192,7 +192,7 @@ - + @@ -209,7 +209,7 @@ - + From 6772e6954b73f495c3e66fdc7a1518d38aafe847 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 18 Jan 2021 17:21:58 +0100 Subject: [PATCH 203/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index f80a4a89..a7d22ca9 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -45,7 +45,7 @@ - + <%= title %> From 7c9c302bbc86c8bbe326f0ba38743e15ce57d7ee Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 14:06:39 +0100 Subject: [PATCH 204/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index a7d22ca9..c9a96bf9 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -35,8 +35,8 @@ - - + + @@ -68,7 +68,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -209,7 +209,7 @@ - + From d872c52e1d0cdb9fb6d63522a65fe0259cf436d9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 15:04:54 +0100 Subject: [PATCH 205/561] 1st template --- .../views/extended_intro_slide.xml.erb | 44 ++++++++----------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index c9a96bf9..1dc81fd7 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -25,7 +25,7 @@ - + @@ -40,21 +40,22 @@ - + + + - + + + + + <%= title %> - - - - - @@ -73,21 +74,22 @@ - + + + - + + + + + <%= subtitle %> - - - - - @@ -116,11 +118,6 @@ - - - - - @@ -139,7 +136,7 @@ - + @@ -150,11 +147,6 @@ - - - - - From 161e64f23718b8f24589608ba48fee44fb1e841e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 15:22:10 +0100 Subject: [PATCH 206/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 1dc81fd7..9953cda9 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -1,5 +1,5 @@ - + From beb9ae669950a1182bd65dd12b72e7422f1e0a90 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 15:41:28 +0100 Subject: [PATCH 207/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9953cda9..1dc81fd7 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -1,5 +1,5 @@ - + From 37268c32be20b5f8c7fbec110d406c1b84f65dcc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 16:04:44 +0100 Subject: [PATCH 208/561] 1st template --- lib/powerpoint/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index 957927ce..53482c3d 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -11,7 +11,7 @@ def render_view(template_name, path, variables = {}) b = merge_variables(binding, variables) data = renderer.result(b) - File.open(path, 'w') { |f| f << data } + File.open(path, 'w') { |f| f << data.squish! } end def read_template(filename) From 694a05acfb8828840a29f21e8f579c75419db4ca Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 16:28:42 +0100 Subject: [PATCH 209/561] 1st template --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 1dc81fd7..9bca8571 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -91,7 +91,7 @@ - + @@ -216,4 +216,4 @@ - \ No newline at end of file + From 2336ea11f7bf75fa8314eddb07bc1ca88b4e943f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 16:42:11 +0100 Subject: [PATCH 210/561] 1st template --- lib/powerpoint/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index 53482c3d..884ca044 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -11,7 +11,7 @@ def render_view(template_name, path, variables = {}) b = merge_variables(binding, variables) data = renderer.result(b) - File.open(path, 'w') { |f| f << data.squish! } + File.open(path, 'w') { |f| f << data.squish!.gsub('> <', '><') } end def read_template(filename) From 51b3d636b226dc6d65de407e874605c189512b71 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 16:53:11 +0100 Subject: [PATCH 211/561] 1st template --- .../views/extended_intro_slide.xml.erb | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9bca8571..5ab46e49 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -177,35 +177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From fd483996aa7aefd7ec89eeabb681798f394fea26 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 19 Jan 2021 16:56:05 +0100 Subject: [PATCH 212/561] 1st template --- .../views/extended_intro_slide.xml.erb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5ab46e49..9bca8571 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -177,6 +177,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a3f13fb3d5b88b1140305ace6a257997fc2e63a8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 14:12:21 +0100 Subject: [PATCH 213/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index e8be1980..7fc992d0 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1,5 +1 @@ - - - - - \ No newline at end of file + \ No newline at end of file From 8de3a56d48240247ec67f61c3d9131416ac41b52 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 14:33:37 +0100 Subject: [PATCH 214/561] 1st template --- .../views/extended_intro_slide.xml.erb | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9bca8571..5ab46e49 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -177,35 +177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f94be1335ab36aaea7a6d8e86052de2926b8d1fb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 14:42:55 +0100 Subject: [PATCH 215/561] 1st template --- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 7fc992d0..cb335fb3 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 8f1eb70c0bd3b02f7ff751953dbb17178a97a64c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 14:51:03 +0100 Subject: [PATCH 216/561] 1st template --- .../views/extended_intro_slide.xml.erb | 29 +++++++++++++++++++ .../views/extended_intro_slide_rel.xml.erb | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 5ab46e49..9bca8571 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -177,6 +177,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index cb335fb3..7fc992d0 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 991a5b4a50cdc4a5dff9e9f8a9e8a58a5a353e57 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 15:26:41 +0100 Subject: [PATCH 217/561] 1st template --- lib/powerpoint/views/presentation.xml.erb | 192 +++++++++++----------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/lib/powerpoint/views/presentation.xml.erb b/lib/powerpoint/views/presentation.xml.erb index 82de0bc0..a6404265 100644 --- a/lib/powerpoint/views/presentation.xml.erb +++ b/lib/powerpoint/views/presentation.xml.erb @@ -8,103 +8,103 @@ <% end %> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 01aaf0740ccee9aa101038a088a9c1664d6311a8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 15:51:32 +0100 Subject: [PATCH 218/561] 1st template --- lib/powerpoint/views/presentation.xml.rel.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/powerpoint/views/presentation.xml.rel.erb b/lib/powerpoint/views/presentation.xml.rel.erb index 79470cf4..00075bb5 100644 --- a/lib/powerpoint/views/presentation.xml.rel.erb +++ b/lib/powerpoint/views/presentation.xml.rel.erb @@ -6,7 +6,6 @@ <% slides.each_with_index do |slide, index| %> - <% id = 5 + (index+1) %> - + <% end %> \ No newline at end of file From f080ae45746ff965f8a4a7a57702431eefaf5037 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 16:50:03 +0100 Subject: [PATCH 219/561] 1st template --- lib/powerpoint/views/content_type.xml.erb | 50 +++++++++++------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/lib/powerpoint/views/content_type.xml.erb b/lib/powerpoint/views/content_type.xml.erb index 7b2a6828..49dcafed 100644 --- a/lib/powerpoint/views/content_type.xml.erb +++ b/lib/powerpoint/views/content_type.xml.erb @@ -1,30 +1,26 @@ - - - <% file_types.each do |type| %> - - <% end %> - - - <% slides.each_with_index do |slide, index| %> - - <% end %> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e3dc5f15e91f8e7862151516b4f24e02c90577a2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 17:17:53 +0100 Subject: [PATCH 220/561] 1st template --- lib/powerpoint/views/content_type.xml.erb | 49 ++++++++++++----------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/lib/powerpoint/views/content_type.xml.erb b/lib/powerpoint/views/content_type.xml.erb index 49dcafed..3e75d908 100644 --- a/lib/powerpoint/views/content_type.xml.erb +++ b/lib/powerpoint/views/content_type.xml.erb @@ -1,26 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + <% slides.each_with_index do |slide, index| %> + + <% end %> + + + + + + + + + + + + + + + + + \ No newline at end of file From 531ea1e4dbb85ef1b2bd0223176768b2524374af Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 17:26:53 +0100 Subject: [PATCH 221/561] 1st template --- lib/powerpoint/views/content_type.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/content_type.xml.erb b/lib/powerpoint/views/content_type.xml.erb index 3e75d908..f71146f8 100644 --- a/lib/powerpoint/views/content_type.xml.erb +++ b/lib/powerpoint/views/content_type.xml.erb @@ -4,6 +4,7 @@ + <% slides.each_with_index do |slide, index| %> From 56b591a8e4ed658e6d428edc03e01e814d51d209 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 20 Jan 2021 17:37:38 +0100 Subject: [PATCH 222/561] 1st template --- lib/powerpoint/views/content_type.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/content_type.xml.erb b/lib/powerpoint/views/content_type.xml.erb index f71146f8..5ef19eda 100644 --- a/lib/powerpoint/views/content_type.xml.erb +++ b/lib/powerpoint/views/content_type.xml.erb @@ -5,6 +5,7 @@ + <% slides.each_with_index do |slide, index| %> From 2b157784542e177260817b729abcedb89eae1d92 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 21 Jan 2021 16:47:02 +0100 Subject: [PATCH 223/561] restore ranking --- lib/powerpoint/slide/dashboard.rb | 38 +++ lib/powerpoint/views/dashboard.xml.erb | 255 +++++++++++++++++++++ lib/powerpoint/views/dashboard_rel.xml.erb | 1 + 3 files changed, 294 insertions(+) create mode 100644 lib/powerpoint/slide/dashboard.rb create mode 100644 lib/powerpoint/views/dashboard.xml.erb create mode 100644 lib/powerpoint/views/dashboard_rel.xml.erb diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb new file mode 100644 index 00000000..5d936fcc --- /dev/null +++ b/lib/powerpoint/slide/dashboard.rb @@ -0,0 +1,38 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Dashboard + include Powerpoint::Util + + attr_reader :title, :subtitle, :subtitle_2, :image_path, :image_path_2, :image_name, :data + + def initialize(options={}) + require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2, data], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @image_name = File.basename(@image_path) + @image_name_2 = File.basename(@image_path_2) + end + + def save(extract_path, index) + copy_media(extract_path, @image_path) + copy_media(extract_path, @image_path_2) + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def save_rel_xml(extract_path, index) + render_view('dashboard.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('dashboard.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb new file mode 100644 index 00000000..9df27cd7 --- /dev/null +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= Date.today %> + + + + + + <% data.each_with_index do |datum, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + <% end %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/powerpoint/views/dashboard_rel.xml.erb b/lib/powerpoint/views/dashboard_rel.xml.erb new file mode 100644 index 00000000..7fc992d0 --- /dev/null +++ b/lib/powerpoint/views/dashboard_rel.xml.erb @@ -0,0 +1 @@ + \ No newline at end of file From 4d4b4403e181838cbad34f46709c939d4dcb2cc7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 21 Jan 2021 16:47:59 +0100 Subject: [PATCH 224/561] restore ranking --- lib/powerpoint/views/dashboard.xml.erb | 36 +++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 9df27cd7..7c036c80 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -178,7 +178,41 @@ - <%= subtitle %> + <%= datum[0] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= datum[0] %> From 8abdc617b90dc3ed5aa85b025e255320d7a65c41 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 14:20:57 +0100 Subject: [PATCH 225/561] dashboard --- lib/powerpoint/presentation.rb | 6 +- lib/powerpoint/slide/dashboard_2.rb | 41 ++++ lib/powerpoint/views/dashboard.xml.erb | 125 +++++----- lib/powerpoint/views/dashboards_users.xml | 215 ++++++++++++++++++ lib/powerpoint/views/dashboards_users_rel.xml | 8 + 5 files changed, 333 insertions(+), 62 deletions(-) create mode 100644 lib/powerpoint/slide/dashboard_2.rb create mode 100644 lib/powerpoint/views/dashboards_users.xml create mode 100644 lib/powerpoint/views/dashboards_users_rel.xml diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 3f292766..1aaba158 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,6 +56,10 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end + def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, data) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,image_1: image_1, image_2: image_2, data: data) + end + def save(path) Dir.mktmpdir do |dir| extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}" @@ -88,7 +92,7 @@ def save(path) end def file_types - slides.map {|slide| slide.file_type if slide.respond_to? :file_type }.compact.uniq + end end end diff --git a/lib/powerpoint/slide/dashboard_2.rb b/lib/powerpoint/slide/dashboard_2.rb new file mode 100644 index 00000000..18ff45d6 --- /dev/null +++ b/lib/powerpoint/slide/dashboard_2.rb @@ -0,0 +1,41 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Dashboard_2 + include Powerpoint::Util + + attr_reader :title, :subtitle,:subtitle_2, :logo, :images + + def initialize(options={}) + require_arguments [:title, :subtitle,:subtitle_2,:logo, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @images = images + end + + def save(extract_path, index) + @images.each do |image| + copy_media(extract_path, image[0]) + end + + copy_media(extract_path, logo) + + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def save_rel_xml(extract_path, index) + render_view('dashboard_users_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('dashboard_user.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7c036c80..a45f663b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -142,16 +142,76 @@ - <%= Date.today %> + <%= subtitle_2 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% data_count = 7 %> <% data.each_with_index do |datum, index| %> + <% data_count = data_count + 1 %> - + @@ -183,6 +243,7 @@ + <% data_count = data_count + 1 %> @@ -212,70 +273,12 @@ - <%= datum[0] %> + <%= datum[1] %> <% end %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/powerpoint/views/dashboards_users.xml b/lib/powerpoint/views/dashboards_users.xml new file mode 100644 index 00000000..2cb61375 --- /dev/null +++ b/lib/powerpoint/views/dashboards_users.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% y_coords = 2664490 %> + <% x_coords = 2349630 %> + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Position: <%= index +1 %> + + + + + + + Votes: <%= image[1] %> + + + + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/dashboards_users_rel.xml b/lib/powerpoint/views/dashboards_users_rel.xml new file mode 100644 index 00000000..c30e7724 --- /dev/null +++ b/lib/powerpoint/views/dashboards_users_rel.xml @@ -0,0 +1,8 @@ + + + + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% images.each_with_index do |image, index| %> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% end %> + \ No newline at end of file From d0e69a040e3d4b60959c1bf5aead94a39c8b8d4b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 14:21:48 +0100 Subject: [PATCH 226/561] dashboard --- lib/powerpoint/slide/{dashboard_2.rb => dashboard_users.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename lib/powerpoint/slide/{dashboard_2.rb => dashboard_users.rb} (94%) diff --git a/lib/powerpoint/slide/dashboard_2.rb b/lib/powerpoint/slide/dashboard_users.rb similarity index 94% rename from lib/powerpoint/slide/dashboard_2.rb rename to lib/powerpoint/slide/dashboard_users.rb index 18ff45d6..79104f20 100644 --- a/lib/powerpoint/slide/dashboard_2.rb +++ b/lib/powerpoint/slide/dashboard_users.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class Dashboard_2 + class DashboardUsers include Powerpoint::Util attr_reader :title, :subtitle,:subtitle_2, :logo, :images From fbda3de4968ea9921c595dc0b85f9693bd67f918 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 14:53:01 +0100 Subject: [PATCH 227/561] dashboard --- lib/powerpoint/slide/dashboard.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 5d936fcc..488c8bec 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -11,7 +11,7 @@ class Dashboard attr_reader :title, :subtitle, :subtitle_2, :image_path, :image_path_2, :image_name, :data def initialize(options={}) - require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2, data], options + require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) From 4522b189740e750c9479ff9de1f9f4fc1a5553cc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 14:56:01 +0100 Subject: [PATCH 228/561] dashboard --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 1aaba158..8d1613b5 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -57,7 +57,7 @@ def add_image_slide(title, subtitle = nil,images) end def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, data) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,image_1: image_1, image_2: image_2, data: data) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,image_path: image_1, image_path_2: image_2, data: data) end def save(path) From bec434e004705a5112ea7d1c70ec2a0b38b5ef57 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 15:38:28 +0100 Subject: [PATCH 229/561] dashboard --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 8d1613b5..e65d3148 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -57,7 +57,7 @@ def add_image_slide(title, subtitle = nil,images) end def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, data) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,image_path: image_1, image_path_2: image_2, data: data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, data: data) end def save(path) From 8c436d2d7334cc32df2babf6f7648326e3006b96 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 15:48:16 +0100 Subject: [PATCH 230/561] dashboard --- lib/powerpoint.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index cc08afd3..6d05de84 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -8,6 +8,8 @@ require 'powerpoint/slide/pictorial' require 'powerpoint/slide/text_picture_split' require 'powerpoint/slide/picture_description' +require 'powerpoint/slide/dashboard_users' +require 'powerpoint/slide/dashboard' require 'powerpoint/compression' require 'powerpoint/presentation' From a745d717c193bb52a4027104c1f61203d6aeb9e7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 16:09:17 +0100 Subject: [PATCH 231/561] dashboard --- lib/powerpoint/slide/dashboard.rb | 1 + lib/powerpoint/views/dashboard.xml.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 488c8bec..ef8d5df3 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -13,6 +13,7 @@ class Dashboard def initialize(options={}) require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} + @data = data @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) end diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a45f663b..373dc6f2 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -207,7 +207,7 @@ <% data_count = 7 %> - <% data.each_with_index do |datum, index| %> + <% @data.each_with_index do |datum, index| %> <% data_count = data_count + 1 %> From 18f1e77feaff3de9b1a55b12da6c3c4d3ae67e3c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 26 Jan 2021 18:08:52 +0100 Subject: [PATCH 232/561] dashboard --- lib/powerpoint/slide/dashboard.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index ef8d5df3..3e16661b 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -26,7 +26,7 @@ def save(extract_path, index) end def save_rel_xml(extract_path, index) - render_view('dashboard.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('dashboard_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml From ba9c74113e29cd76453179915b1af791a9dc5350 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 27 Jan 2021 17:43:35 +0100 Subject: [PATCH 233/561] gender symbols --- lib/powerpoint/slide/dashboard.rb | 8 ++- lib/powerpoint/views/dashboard.xml.erb | 60 +++++++++++++++++++++- lib/powerpoint/views/dashboard_rel.xml.erb | 9 +++- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 3e16661b..428fe261 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,19 +8,23 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :image_path, :image_path_2, :image_name, :data + attr_reader :title, :subtitle, :subtitle_2, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data def initialize(options={}) - require_arguments [:title, :subtitle, :image_path, :image_path_2, :subtitle_2, :data], options + require_arguments [:title, :subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :subtitle_2, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) + @image_name_3 = File.basename(@image_path_3) + @image_name_4 = File.basename(@image_path_4) end def save(extract_path, index) copy_media(extract_path, @image_path) copy_media(extract_path, @image_path_2) + copy_media(extract_path, @image_path_3) + copy_media(extract_path, @image_path_4) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 373dc6f2..1f9fa207 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -205,7 +205,65 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% data_count = 7 %> <% @data.each_with_index do |datum, index| %> <% data_count = data_count + 1 %> diff --git a/lib/powerpoint/views/dashboard_rel.xml.erb b/lib/powerpoint/views/dashboard_rel.xml.erb index 7fc992d0..c64899a6 100644 --- a/lib/powerpoint/views/dashboard_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_rel.xml.erb @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file From 32b667ca815ac9362f09025ab0b97aa581949ea5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 27 Jan 2021 18:51:20 +0100 Subject: [PATCH 234/561] gender icons and age images --- lib/powerpoint/presentation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index e65d3148..7d79dd16 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,8 +56,8 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, data: data) + def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, image_3, image_4, data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) end def save(path) From f2ab4c3676bb7ee051b5997c692272b7398b9277 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 15:00:54 +0100 Subject: [PATCH 235/561] dashboard 2 --- lib/powerpoint/presentation.rb | 4 ++++ lib/powerpoint/slide/dashboard_users.rb | 4 ++-- lib/powerpoint/views/dashboard.xml.erb | 22 +++++++--------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 7d79dd16..c2c8e5d3 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -60,6 +60,10 @@ def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_ @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) end + def add_dashboard_users_slide(title, subtitle = nil, subtitle_2 = nil, images) + @slides << Powerpoint::Slide::DashboardUsers.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: data) + end + def save(path) Dir.mktmpdir do |dir| extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}" diff --git a/lib/powerpoint/slide/dashboard_users.rb b/lib/powerpoint/slide/dashboard_users.rb index 79104f20..3cf0dcad 100644 --- a/lib/powerpoint/slide/dashboard_users.rb +++ b/lib/powerpoint/slide/dashboard_users.rb @@ -8,10 +8,10 @@ module Slide class DashboardUsers include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :logo, :images + attr_reader :title, :subtitle,:subtitle_2, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2,:logo, :images], options + require_arguments [:title, :subtitle,:subtitle_2, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images end diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 1f9fa207..ebb3760b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -1,14 +1,6 @@ - - - - - - - - @@ -173,7 +165,7 @@ - + @@ -201,8 +193,8 @@ - - + + @@ -230,8 +222,8 @@ - - + + @@ -259,8 +251,8 @@ - - + + From 90637a953e681fb38e269804dd3f1d95b4428825 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 15:19:28 +0100 Subject: [PATCH 236/561] dashboard 2 --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index c2c8e5d3..432c9112 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -61,7 +61,7 @@ def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_ end def add_dashboard_users_slide(title, subtitle = nil, subtitle_2 = nil, images) - @slides << Powerpoint::Slide::DashboardUsers.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: data) + @slides << Powerpoint::Slide::DashboardUsers.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: images) end def save(path) From 06c7dd515c03484f801fee609647804e75d3eb26 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 15:46:01 +0100 Subject: [PATCH 237/561] new images and second slide --- lib/powerpoint/slide/dashboard_users.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/powerpoint/slide/dashboard_users.rb b/lib/powerpoint/slide/dashboard_users.rb index 3cf0dcad..7799a162 100644 --- a/lib/powerpoint/slide/dashboard_users.rb +++ b/lib/powerpoint/slide/dashboard_users.rb @@ -21,8 +21,6 @@ def save(extract_path, index) copy_media(extract_path, image[0]) end - copy_media(extract_path, logo) - save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end From e2fe12c199337745482e0c41cecd84a143c72c90 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:01:09 +0100 Subject: [PATCH 238/561] dashboard_user --- lib/powerpoint.rb | 2 +- lib/powerpoint/presentation.rb | 2 +- .../slide/{dashboard_users.rb => dashboard_user.rb} | 4 ++-- .../views/{dashboards_users.xml => dashboard_user.xml.erb} | 0 .../{dashboards_users_rel.xml => dashboard_user_rel.xml.erb} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/powerpoint/slide/{dashboard_users.rb => dashboard_user.rb} (83%) rename lib/powerpoint/views/{dashboards_users.xml => dashboard_user.xml.erb} (100%) rename lib/powerpoint/views/{dashboards_users_rel.xml => dashboard_user_rel.xml.erb} (100%) diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 6d05de84..d1de160d 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -8,7 +8,7 @@ require 'powerpoint/slide/pictorial' require 'powerpoint/slide/text_picture_split' require 'powerpoint/slide/picture_description' -require 'powerpoint/slide/dashboard_users' +require 'powerpoint/slide/dashboard_user' require 'powerpoint/slide/dashboard' require 'powerpoint/compression' require 'powerpoint/presentation' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 432c9112..e2e479c0 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -60,7 +60,7 @@ def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_ @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) end - def add_dashboard_users_slide(title, subtitle = nil, subtitle_2 = nil, images) + def add_dashboard_user_slide(title, subtitle = nil, subtitle_2 = nil, images) @slides << Powerpoint::Slide::DashboardUsers.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: images) end diff --git a/lib/powerpoint/slide/dashboard_users.rb b/lib/powerpoint/slide/dashboard_user.rb similarity index 83% rename from lib/powerpoint/slide/dashboard_users.rb rename to lib/powerpoint/slide/dashboard_user.rb index 7799a162..9b67fe28 100644 --- a/lib/powerpoint/slide/dashboard_users.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class DashboardUsers + class DashboardUser include Powerpoint::Util attr_reader :title, :subtitle,:subtitle_2, :images @@ -26,7 +26,7 @@ def save(extract_path, index) end def save_rel_xml(extract_path, index) - render_view('dashboard_users_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('dashboard_user_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml diff --git a/lib/powerpoint/views/dashboards_users.xml b/lib/powerpoint/views/dashboard_user.xml.erb similarity index 100% rename from lib/powerpoint/views/dashboards_users.xml rename to lib/powerpoint/views/dashboard_user.xml.erb diff --git a/lib/powerpoint/views/dashboards_users_rel.xml b/lib/powerpoint/views/dashboard_user_rel.xml.erb similarity index 100% rename from lib/powerpoint/views/dashboards_users_rel.xml rename to lib/powerpoint/views/dashboard_user_rel.xml.erb From 7601fc188b8b5449413ed0d30678fb2c20ce47f9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:09:05 +0100 Subject: [PATCH 239/561] dashboard_user --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index e2e479c0..80c5ec69 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -61,7 +61,7 @@ def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_ end def add_dashboard_user_slide(title, subtitle = nil, subtitle_2 = nil, images) - @slides << Powerpoint::Slide::DashboardUsers.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: images) + @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: images) end def save(path) From f8fb69abf91b9761266eedc096b926349048c69c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:11:42 +0100 Subject: [PATCH 240/561] dashboard_user --- lib/powerpoint/views/dashboard_user_rel.xml.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user_rel.xml.erb b/lib/powerpoint/views/dashboard_user_rel.xml.erb index c30e7724..3ed5b29b 100644 --- a/lib/powerpoint/views/dashboard_user_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_user_rel.xml.erb @@ -1,7 +1,6 @@ - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> From 08715955254e899367da3b7e3373d92928e2ed85 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:36:07 +0100 Subject: [PATCH 241/561] dashboard_user --- lib/powerpoint/slide/dashboard_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index 9b67fe28..efdd5d0b 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -18,7 +18,7 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| - copy_media(extract_path, image[0]) + copy_media(extract_path, image[1]) end save_rel_xml(extract_path, index) From be205d13c3d6436d8325d2b131ab01288cac3464 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:50:09 +0100 Subject: [PATCH 242/561] dashboard_user --- lib/powerpoint/slide/dashboard_user.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index efdd5d0b..17420af7 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -18,6 +18,9 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| + puts '---------------->' + puts image.inspect + puts '---------------->' copy_media(extract_path, image[1]) end From f9184672e7c68b577b193fa683343bfe10d20938 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 17:57:46 +0100 Subject: [PATCH 243/561] dashboard_user --- lib/powerpoint/slide/dashboard_user.rb | 3 --- lib/powerpoint/views/dashboard_user_rel.xml.erb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index 17420af7..efdd5d0b 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -18,9 +18,6 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| - puts '---------------->' - puts image.inspect - puts '---------------->' copy_media(extract_path, image[1]) end diff --git a/lib/powerpoint/views/dashboard_user_rel.xml.erb b/lib/powerpoint/views/dashboard_user_rel.xml.erb index 3ed5b29b..7f16edfe 100644 --- a/lib/powerpoint/views/dashboard_user_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_user_rel.xml.erb @@ -2,6 +2,6 @@ <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From 6265af4fe11e742e2bcf9d9425d792b9a0e114b7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 18:11:13 +0100 Subject: [PATCH 244/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 38 +-------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 2cb61375..c1b514ec 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -99,35 +99,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% y_coords = 2664490 %> <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> @@ -189,14 +160,7 @@ - Position: <%= index +1 %> - - - - - - - Votes: <%= image[1] %> + Votes: <%= image[0] %> From 87aee68c646aeee7317d43aada829f49491a5b2a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 28 Jan 2021 18:16:18 +0100 Subject: [PATCH 245/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index c1b514ec..18d3b0fe 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -125,7 +125,7 @@ - + @@ -160,7 +160,7 @@ - Votes: <%= image[0] %> + <%= image[0] %> From 2058f8d8edf087865ce5cf9121ee116d3d26be7e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 13:24:03 +0100 Subject: [PATCH 246/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 18d3b0fe..28e54c08 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -125,7 +125,7 @@ - + From 34506e952713031aeccfa4d98a0cbd4260fdb57f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 13:41:55 +0100 Subject: [PATCH 247/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 28e54c08..fd965566 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -100,7 +100,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2349630 %> + <% x_coords = 3349630 %> <% images.each_with_index do |image, index| %> @@ -124,7 +124,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -158,6 +158,7 @@ + <%= image[0] %> From eabcb635445d5f660cb3520ebf07ac808a1460c8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 13:52:08 +0100 Subject: [PATCH 248/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index fd965566..a4a56065 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -158,7 +158,7 @@ - + <%= image[0] %> From ded1e44cf310e28dc6b21d0808f1a749c79582f7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 14:43:27 +0100 Subject: [PATCH 249/561] dashboard 3 files --- lib/powerpoint/views/extended_intro_slide.xml.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index 9bca8571..d731295a 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -57,6 +57,7 @@ + <% if subtitle.present? %> @@ -91,6 +92,8 @@ + <% end %> + <% if subtitle.present? %> @@ -119,6 +122,7 @@ + <% end %> From 304d1253ccb91a31a4296124c1f09e717158d224 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 14:49:00 +0100 Subject: [PATCH 250/561] dashboard 3 files --- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index a4a56065..030aafd1 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -100,7 +100,7 @@ <% y_coords = 2664490 %> - <% x_coords = 3349630 %> + <% x_coords = 4349630 %> <% images.each_with_index do |image, index| %> From b2f74bd4074207a79388ea9fa163eb46cad728b5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 15:22:36 +0100 Subject: [PATCH 251/561] dashboard 3 files --- lib/powerpoint/views/dashboard.xml.erb | 6 ++++-- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ebb3760b..992b5f1f 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,6 +256,8 @@ + <% y_coords = 2664490 %> + <% x_coords = 3549630 %> <% data_count = 7 %> <% @data.each_with_index do |datum, index| %> <% data_count = data_count + 1 %> @@ -271,8 +273,8 @@ - - + + diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 030aafd1..511ea764 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -100,7 +100,7 @@ <% y_coords = 2664490 %> - <% x_coords = 4349630 %> + <% x_coords = 3549630 %> <% images.each_with_index do |image, index| %> From c969bbd01cf36b23126f6573387539d809edfc3f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 15:29:33 +0100 Subject: [PATCH 252/561] dashboard 3 files --- lib/powerpoint/views/dashboard.xml.erb | 8 ++------ lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 992b5f1f..1e82d38e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -285,7 +285,7 @@ - + @@ -320,11 +320,7 @@ - - - - - + <%= datum[1] %> diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 511ea764..eb9045ad 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -100,7 +100,7 @@ <% y_coords = 2664490 %> - <% x_coords = 3549630 %> + <% x_coords = 3849630 %> <% images.each_with_index do |image, index| %> From 5ab870a12f035e3fe31af09bb6b08407af7a0fef Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 16:19:13 +0100 Subject: [PATCH 253/561] dashboard 3 files --- lib/powerpoint/views/dashboard.xml.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 1e82d38e..ebb3760b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,8 +256,6 @@ - <% y_coords = 2664490 %> - <% x_coords = 3549630 %> <% data_count = 7 %> <% @data.each_with_index do |datum, index| %> <% data_count = data_count + 1 %> @@ -273,8 +271,8 @@ - - + + @@ -285,7 +283,7 @@ - + @@ -320,7 +318,11 @@ - + + + + + <%= datum[1] %> From 6c2074380ce50c569d6169f42e46f14c15e0426b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 17:01:18 +0100 Subject: [PATCH 254/561] genders --- lib/powerpoint/views/dashboard.xml.erb | 43 ++------------------------ 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ebb3760b..1af7f5f0 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,12 +256,9 @@ - <% data_count = 7 %> - <% @data.each_with_index do |datum, index| %> - <% data_count = data_count + 1 %> - + @@ -288,47 +285,11 @@ - <%= datum[0] %> + <%= data['genders'] %> - <% data_count = data_count + 1 %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= datum[1] %> - - - - - <% end %> From 414c254906d1d4e4cb2250a7d13e258f3901fc1d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 17:17:36 +0100 Subject: [PATCH 255/561] genders --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 1af7f5f0..e3e8f39d 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -285,7 +285,7 @@ - <%= data['genders'] %> + <%= @data['genders'] %> From af74032cbdcaee60ca0ad9b5fa6563f154853816 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 17:22:05 +0100 Subject: [PATCH 256/561] genders --- lib/powerpoint/views/dashboard.xml.erb | 43 ++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index e3e8f39d..ebb3760b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,9 +256,12 @@ + <% data_count = 7 %> + <% @data.each_with_index do |datum, index| %> + <% data_count = data_count + 1 %> - + @@ -285,11 +288,47 @@ - <%= @data['genders'] %> + <%= datum[0] %> + <% data_count = data_count + 1 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= datum[1] %> + + + + + <% end %> From 4ee12249e2aa6f6ba7fa81fa7376778d479d1c85 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 17:25:21 +0100 Subject: [PATCH 257/561] genders --- lib/powerpoint/views/dashboard.xml.erb | 43 ++------------------------ 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ebb3760b..e3e8f39d 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,12 +256,9 @@ - <% data_count = 7 %> - <% @data.each_with_index do |datum, index| %> - <% data_count = data_count + 1 %> - + @@ -288,47 +285,11 @@ - <%= datum[0] %> + <%= @data['genders'] %> - <% data_count = data_count + 1 %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= datum[1] %> - - - - - <% end %> From 36083f430cdff6c227d0688313e5139ab7e6131e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 29 Jan 2021 17:31:26 +0100 Subject: [PATCH 258/561] genders --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index e3e8f39d..478149eb 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -285,7 +285,7 @@ - <%= @data['genders'] %> + <%= @data[:genders] %> From 261df986cb0e9373370f972ab2ddd2ec33eda1aa Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 12:07:45 +0100 Subject: [PATCH 259/561] subtitles --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/dashboard.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 80c5ec69..148e7863 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,8 +56,8 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, image_1, image_2, image_3, image_4, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) + def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) end def add_dashboard_user_slide(title, subtitle = nil, subtitle_2 = nil, images) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 428fe261..73386cac 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,10 +8,10 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data + attr_reader :title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data def initialize(options={}) - require_arguments [:title, :subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :subtitle_2, :data], options + require_arguments [:title, :subtitle, :subtitle_2, ,:graph_1_title, :graph_1_subtitle :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(@image_path) From cabdf0426269a44d38c32f53ad37d17d9b9c9e1c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 12:13:51 +0100 Subject: [PATCH 260/561] subtitles for graphs --- lib/powerpoint/slide/dashboard.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 73386cac..d65cdd60 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,10 +8,10 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data + attr_reader :title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data def initialize(options={}) - require_arguments [:title, :subtitle, :subtitle_2, ,:graph_1_title, :graph_1_subtitle :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options + require_arguments [:title, :subtitle, :subtitle_2, ,:graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(@image_path) From 76621a4fe28199e847ec298ff03b46c9ed991daa Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 12:20:13 +0100 Subject: [PATCH 261/561] subtitles for graphs --- lib/powerpoint/slide/dashboard.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index d65cdd60..47960bf0 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -11,7 +11,7 @@ class Dashboard attr_reader :title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data def initialize(options={}) - require_arguments [:title, :subtitle, :subtitle_2, ,:graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options + require_arguments [:title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(@image_path) From 025d0ee0222d08c90f618765a99ccd5c15edf081 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 12:26:40 +0100 Subject: [PATCH 262/561] subtitles for graphs --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 148e7863..052cf4a7 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -57,7 +57,7 @@ def add_image_slide(title, subtitle = nil,images) end def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2,, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) end def add_dashboard_user_slide(title, subtitle = nil, subtitle_2 = nil, images) From 785f8f94331658401751d96c9ecc2350f4d7f74d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 12:41:41 +0100 Subject: [PATCH 263/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 82 +++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 478149eb..52c203f6 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -169,6 +169,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + + + <%= graph_1_subtitle %> + + + + @@ -256,9 +296,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + + + <%= graph_1_subtitle %> + + + + - + From fdb7bad614b151dfeb2f31be6863c103fb9fdfb2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 13:11:20 +0100 Subject: [PATCH 264/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 66 ++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 52c203f6..98e8052d 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -200,7 +200,35 @@ <%= graph_1_title %> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -296,7 +324,7 @@ - + @@ -325,13 +353,41 @@ - <%= graph_1_title %> + <%= graph_2_title %> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - <%= graph_1_subtitle %> + <%= graph_2_subtitle %> From 0fe7da071d5974c6dd1bca9f5d237d697b5585ac Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 13:31:20 +0100 Subject: [PATCH 265/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 98e8052d..97064cd4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -183,7 +183,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -372,7 +372,7 @@ - + From 75fd49718231c9e34e2383ee52367038039c9e77 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 13:50:27 +0100 Subject: [PATCH 266/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 34 -------------------------- 1 file changed, 34 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 97064cd4..95d823a4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -392,40 +392,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:genders] %> - - - - From f724b755eafe96a57c6f2daf863a9b21068eba3b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 13:56:36 +0100 Subject: [PATCH 267/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 174 +++++++++++++++---------- 1 file changed, 104 insertions(+), 70 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 95d823a4..07c10538 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -171,33 +171,33 @@ - - - - - - - - - + + + + + + + - - + + - - - - + + - + - + + + + + <%= graph_1_title %> @@ -205,33 +205,33 @@ - - - - - - - - - + + + + + + + - - + + - - - - + + - + - + + + + + <%= graph_1_subtitle %> @@ -326,72 +326,106 @@ - - - - - - - - - + + + + + + + - - + + - - - - + + - + - + + + + + <%= graph_2_title %> - - + + - - - - - - - - - + + + + + + + - - + + - - - - + + - + - + + + + + <%= graph_2_subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:genders] %> + + + + From 6734a010c437cd0c3438e568dbeb0d6d13bb5948 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 14:44:09 +0100 Subject: [PATCH 268/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 48 ++++---------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 07c10538..7a644fc4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,7 +181,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -392,40 +392,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:genders] %> - - - - From ec98a173e0e43ab936d8c5206063f3927db7376b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 14:52:15 +0100 Subject: [PATCH 269/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7a644fc4..55e154fc 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -22,28 +22,22 @@ - + - - + + - - - + - - - - - + <%= title %> From 4f579db904c3f683785dd8490ae5a6d5fb9bb074 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 14:55:51 +0100 Subject: [PATCH 270/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 30 +++++++++++--------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 55e154fc..30180563 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -45,33 +45,27 @@ - + - + - - + + - - - + - + - - - - - + <%= subtitle %> @@ -79,18 +73,18 @@ - + - + - - + + @@ -99,7 +93,7 @@ - + <%= subtitle_2 %> From 6bb748cdd0c21de89b4dfebb1ada562eef4227f1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 15:06:28 +0100 Subject: [PATCH 271/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 44 +++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 30180563..6c1ed9d8 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -152,8 +152,8 @@ - - + + @@ -250,7 +250,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -380,6 +380,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:genders] %> + + + + From 32ce10105e8ee1d031f80d36b0bb134da136c72e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 15:36:44 +0100 Subject: [PATCH 272/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6c1ed9d8..13fdb3c1 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -152,8 +152,8 @@ - - + + From 8865c10fe3cfcff48639ab8b1f57b17f3f5ad2cf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 15:41:37 +0100 Subject: [PATCH 273/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 13fdb3c1..9556817a 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -153,7 +153,7 @@ - + From 69dc3468fcaf9669d6eb87cce90a81540f417f98 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:02:27 +0100 Subject: [PATCH 274/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 9556817a..ee78f755 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,7 +181,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -392,7 +392,7 @@ - + From 47a215fa98d4d1aeefbcb0319f18221f1bc4d2f1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:17:39 +0100 Subject: [PATCH 275/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ee78f755..8d1abf9e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -169,7 +169,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -409,7 +409,7 @@ - <%= @data[:genders] %> + <%= @data[:genders][nil] %> From a41da2eb24c0fd5e1e1e4f191755124263a7466b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:25:28 +0100 Subject: [PATCH 276/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 76 ++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 8d1abf9e..79f72d40 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,7 +324,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -404,7 +404,75 @@ - + + + + + + <%= @data[:genders]['m'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:genders]['f'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5e0f53ce6f377c85f3bc372befeafee7957b967d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:30:05 +0100 Subject: [PATCH 277/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 79f72d40..a5654ab6 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -325,7 +325,7 @@ - + @@ -359,7 +359,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -426,8 +426,8 @@ - - + + @@ -460,8 +460,8 @@ - - + + From c5d1a688c45527b06ee0228c264a70a1612f931d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:41:04 +0100 Subject: [PATCH 278/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a5654ab6..34f3bea6 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,8 +324,8 @@ - - + + @@ -358,7 +358,7 @@ - + @@ -392,8 +392,8 @@ - - + + @@ -426,8 +426,8 @@ - - + + @@ -460,8 +460,8 @@ - - + + From a5cf72af10e987b449ad422e47fd75b800c9f76a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:45:52 +0100 Subject: [PATCH 279/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 34f3bea6..7f5016b2 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,8 +324,8 @@ - - + + @@ -358,7 +358,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -409,7 +409,7 @@ - <%= @data[:genders]['m'] %> + m<%= @data[:genders]['m'] %> @@ -426,7 +426,7 @@ - + @@ -443,7 +443,7 @@ - <%= @data[:genders]['f'] %> + f<%= @data[:genders]['f'] %> @@ -460,7 +460,7 @@ - + @@ -477,7 +477,7 @@ - <%= @data[:genders][nil] %> + nil <%= @data[:genders][nil] %> From a6efeb0a7eb64e69be1f7c76d0657bd0934cc7a5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 16:52:35 +0100 Subject: [PATCH 280/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7f5016b2..8111288b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -169,7 +169,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -426,7 +426,7 @@ - + From f1ec22ef3261ea13c20cf49cdc058b17660f8ba6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 17:00:38 +0100 Subject: [PATCH 281/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 8111288b..8163b1a5 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -203,7 +203,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -426,7 +426,7 @@ - + From d74b741c577f300be3a5c8554a5f6908779f164e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 17:05:09 +0100 Subject: [PATCH 282/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 8163b1a5..6cf3a3c6 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,7 +324,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -426,7 +426,7 @@ - + @@ -460,7 +460,7 @@ - + From 3d9106cdb75dc41920f2e0c1a7009e70613e3f24 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 17:08:53 +0100 Subject: [PATCH 283/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6cf3a3c6..48dcf745 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -469,6 +469,17 @@ + + + + + + + + + Other + + From a40e567bf6ee7c3e2424a96563c9fd52509a7d7b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 17:13:01 +0100 Subject: [PATCH 284/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 42 ++++++++++++++++++++------ 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 48dcf745..a4826a8d 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,7 +324,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -402,14 +402,25 @@ - + - m<%= @data[:genders]['m'] %> + Male + + + + + + + + + + + <%= @data[:genders]['m'] %> @@ -426,7 +437,7 @@ - + @@ -435,6 +446,17 @@ + + + + + + + + + Female + + @@ -443,7 +465,7 @@ - f<%= @data[:genders]['f'] %> + <%= @data[:genders]['f'] %> @@ -460,7 +482,7 @@ - + @@ -470,7 +492,7 @@ - + @@ -481,14 +503,14 @@ - + - nil <%= @data[:genders][nil] %> + <%= @data[:genders][nil] %> From 468e486e3bf251691aa924b7c94b20f6fad57174 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Feb 2021 17:20:57 +0100 Subject: [PATCH 285/561] subtitles for graphs --- lib/powerpoint/views/dashboard.xml.erb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a4826a8d..cc3bc2e8 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -249,7 +249,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -447,7 +447,7 @@ - + @@ -458,7 +458,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -503,7 +503,7 @@ - + From c25be598897a41edf5c1145710cc6d597baa1bbf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 10:07:30 +0100 Subject: [PATCH 286/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 170 +++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index cc3bc2e8..82633afd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -515,6 +515,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total posts in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Time spent in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Image posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Video posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Text posts + + + + From 238e5cef1365557eff4be93e53661a02c2b6c5d7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 10:34:52 +0100 Subject: [PATCH 287/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 82633afd..834d9d3f 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -561,7 +561,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -663,7 +663,7 @@ - + From 70564b464bf804767cfbf3e70e9e7ebff9f5a6ca Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 10:43:26 +0100 Subject: [PATCH 288/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 834d9d3f..91764554 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -527,7 +527,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -663,7 +663,7 @@ - + From 2644415cc39d620c587b04cdfbedea452c44de27 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 10:53:00 +0100 Subject: [PATCH 289/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 91764554..0ee29bb9 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -527,7 +527,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -663,7 +663,7 @@ - + From 3738e68f81c7e675bfc21905bbb032e860f36a0d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 11:12:09 +0100 Subject: [PATCH 290/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 170 ------------------------- 1 file changed, 170 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 0ee29bb9..cc3bc2e8 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -515,176 +515,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Total posts in market - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Time spent in market - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Image posts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Video posts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Text posts - - - - From 7c72b4ad3fba02002db5de660932bf040be40d2a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 11:37:53 +0100 Subject: [PATCH 291/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 188 +++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index cc3bc2e8..a5419968 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -159,7 +159,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -348,7 +348,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -472,7 +472,7 @@ - + @@ -515,6 +515,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total posts in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Time spent in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Image posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Video posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Text posts + + + + From d0581597a33eb76b20694cd88451a247a6e619b3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 11:56:51 +0100 Subject: [PATCH 292/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 172 ++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a5419968..ad717870 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -677,7 +677,7 @@ - + Text posts @@ -685,6 +685,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:total_posts] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:log_time] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:images] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:videos] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:text] %> + + + + From 017c95b7d6659720d95af5b553bc4977acd56509 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 12:03:18 +0100 Subject: [PATCH 293/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ad717870..019d96d2 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -799,7 +799,7 @@ - + @@ -833,9 +833,15 @@ - + + + + + + + @@ -846,9 +852,9 @@ - - - + + + <%= @data[:post_types][:text] %> From 31598642038b6ed42413834c9b81e61bf386bc77 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 12:19:26 +0100 Subject: [PATCH 294/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 019d96d2..7169f418 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -782,7 +782,7 @@ - <%= @data[:post_types][:images] %> + <%= @data[:post_types][:image] %> @@ -816,7 +816,7 @@ - <%= @data[:post_types][:videos] %> + <%= @data[:post_types][:video] %> From 3077eeb137bd16d4c20bc76b9841fb1dffb0cdf3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 13:09:51 +0100 Subject: [PATCH 295/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 81 +++++++++++++++++++++----- 1 file changed, 66 insertions(+), 15 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7169f418..2c270389 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -528,8 +528,14 @@ - + + + + + + + @@ -562,8 +568,14 @@ - + + + + + + + @@ -596,8 +608,14 @@ - + + + + + + + @@ -630,8 +648,14 @@ - + + + + + + + @@ -664,8 +688,14 @@ - + + + + + + + @@ -676,9 +706,6 @@ - - - Text posts @@ -698,8 +725,14 @@ - + + + + + + + @@ -732,8 +765,14 @@ - + + + + + + + @@ -766,8 +805,14 @@ - + + + + + + + @@ -800,8 +845,14 @@ - + + + + + + + @@ -834,7 +885,7 @@ - + @@ -849,9 +900,9 @@ - + - + From 317fb0a3943a7fd6eb1f192f06eebbc0ba9df4bb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 13:23:31 +0100 Subject: [PATCH 296/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 2c270389..a1467e06 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -527,7 +527,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -607,7 +607,7 @@ - + @@ -647,7 +647,7 @@ - + @@ -687,7 +687,7 @@ - + @@ -724,7 +724,7 @@ - + @@ -764,7 +764,7 @@ - + @@ -804,7 +804,7 @@ - + @@ -844,7 +844,7 @@ - + @@ -884,7 +884,7 @@ - + From 4d053161b3f8715f01bcf12680d7f4eedec187e9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 13:34:23 +0100 Subject: [PATCH 297/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a1467e06..1012130e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -346,6 +346,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7026d0125119465190c9a2d1bde34fab2a9d11b8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 13:40:12 +0100 Subject: [PATCH 298/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 80 +++++++++----------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 1012130e..3af28f30 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -73,29 +73,41 @@ - - - + + + + + + + + + - - - + - - + + + + + + + + + + + - + - - - - <%= subtitle_2 %> - + + + + @@ -346,46 +358,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From b9da8f0c5291d960e1b8f8fce2f0478de35c0a5c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 13:51:07 +0100 Subject: [PATCH 299/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 3af28f30..6f3ed271 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -164,7 +164,7 @@ - + From 38428845c3a68fdd9b5aa6385f0590ad0fcdf900 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:00:56 +0100 Subject: [PATCH 300/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6f3ed271..3a6d7151 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -164,7 +164,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -319,7 +319,7 @@ - + From b21afc7b72d0a9cbe3f1571eff097b17bb612c71 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:09:28 +0100 Subject: [PATCH 301/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 3a6d7151..78748b2b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,7 +181,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -319,7 +319,7 @@ - + From 076e14404acc74b46e6de1f7ab2a8b2ee30923b7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:22:42 +0100 Subject: [PATCH 302/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 41 +++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 78748b2b..4400e208 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -111,6 +111,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -215,7 +254,7 @@ - + From b003346336f53a0c281e2298c3ec41ca1316586d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:26:45 +0100 Subject: [PATCH 303/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 43 ++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 4400e208..2334b44c 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -127,7 +127,7 @@ - + @@ -135,7 +135,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ce0d3a2b9d5af781de09a531abebe1e0989cc86e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:32:29 +0100 Subject: [PATCH 304/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 2334b44c..b0133acb 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -135,7 +135,8 @@ - + + @@ -166,7 +167,7 @@ - + @@ -174,7 +175,8 @@ - + + From 265e31ade799685cf9cc2497b7d35a92f041d81a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:38:11 +0100 Subject: [PATCH 305/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index b0133acb..5bcb0cbc 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -135,7 +135,7 @@ - + @@ -175,7 +175,7 @@ - + From 0ef1d4b51a44356c6d49e31f66c42f5c4c3b44c0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 14:50:43 +0100 Subject: [PATCH 306/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 94 ++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 5bcb0cbc..7b511cb4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -73,7 +73,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -151,9 +151,89 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -167,8 +247,8 @@ - - + + From 72e537fe94c577090dc6634ee696fada8dbcf01c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 15:33:09 +0100 Subject: [PATCH 307/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7b511cb4..c725e5aa 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -128,7 +128,7 @@ - + @@ -167,8 +167,8 @@ - - + + @@ -208,7 +208,7 @@ - + @@ -247,8 +247,8 @@ - - + + @@ -341,7 +341,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -530,7 +530,7 @@ - + From 314e3ced69d76eb334bf9e455d38df77afc0f1c7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 15:51:14 +0100 Subject: [PATCH 308/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index c725e5aa..03adfd7e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -167,7 +167,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -341,7 +341,7 @@ - + From 700f85cf2f7612b400e4c78a93966779182f999e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 16:18:02 +0100 Subject: [PATCH 309/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 03adfd7e..10b6c3ad 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -167,7 +167,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -247,8 +247,8 @@ - - + + @@ -341,7 +341,7 @@ - + From 7cb7f4db7c99dabaeda30fe01ce456b862ded584 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 16:26:46 +0100 Subject: [PATCH 310/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 10b6c3ad..ad2f2067 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -168,7 +168,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -247,8 +247,8 @@ - - + + @@ -375,7 +375,7 @@ - + @@ -496,8 +496,8 @@ - - + + @@ -530,7 +530,7 @@ - + From aa1f66faac55721642dd8b209a520b865d4aec8e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 16:50:57 +0100 Subject: [PATCH 311/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index ad2f2067..c3880c39 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -247,7 +247,7 @@ - + From 9ca1167d4a94a0ad0d26c775672cfd2d3ebc729f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 17:05:10 +0100 Subject: [PATCH 312/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index c3880c39..01873770 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,8 +324,8 @@ - - + + From 1bb2c97b65fc084a9442c082b37a169d4c82e55a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Feb 2021 17:12:24 +0100 Subject: [PATCH 313/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 01873770..43a9e2cc 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,8 +324,8 @@ - - + + @@ -375,7 +375,7 @@ - + From 4c17ffbb7c90f72c2014ccf8bf9b2a19e1da6132 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 09:48:26 +0100 Subject: [PATCH 314/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 43a9e2cc..7be57f02 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -324,8 +324,8 @@ - - + + @@ -375,7 +375,7 @@ - + @@ -399,7 +399,7 @@ - + @@ -421,14 +421,14 @@ - + - + @@ -450,14 +450,14 @@ - + - + @@ -479,7 +479,7 @@ - + @@ -530,7 +530,7 @@ - + From de886c24cce08e547aa2222126b7edb8fabfc809 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 10:05:34 +0100 Subject: [PATCH 315/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 278 ++++++++++++------------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7be57f02..add031ca 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -421,11 +421,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Male + + + + + + + + + + + <%= @data[:genders]['m'] %> + + + + @@ -450,11 +495,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Female + + + + + + + + + + + <%= @data[:genders]['f'] %> + + + + @@ -479,11 +569,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Other + + + + + + + + + + + <%= @data[:genders][nil] %> + + + + @@ -530,7 +665,7 @@ - + @@ -551,141 +686,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Male - - - - - - - - - - - <%= @data[:genders]['m'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Female - - - - - - - - - - - <%= @data[:genders]['f'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Other - - - - - - - - - - - <%= @data[:genders][nil] %> - - - From ea5436aa833dd5c13594370bed554a7e3a0a151e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 10:32:18 +0100 Subject: [PATCH 316/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index add031ca..6729501f 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -421,7 +421,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -569,7 +569,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -655,7 +655,7 @@ - + @@ -665,7 +665,7 @@ - + From 5280b0592a95808562db9466d89811b2a1468297 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 10:52:22 +0100 Subject: [PATCH 317/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6729501f..17916043 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -421,7 +421,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -502,7 +502,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -569,14 +569,14 @@ - + - + @@ -586,7 +586,7 @@ - + From 7650b18fcb31c1b34e0344e25e7df3864c2a2071 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 10:57:11 +0100 Subject: [PATCH 318/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 44 ++------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 17916043..49600053 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -140,16 +140,6 @@ - - - - - - - - - - @@ -180,16 +170,6 @@ - - - - - - - - - - @@ -220,16 +200,6 @@ - - - - - - - - - - @@ -260,16 +230,6 @@ - - - - - - - - - - @@ -512,7 +472,7 @@ - + @@ -586,7 +546,7 @@ - + From f8363951ea468a49749d89c7ccff686717616dec Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 11:22:50 +0100 Subject: [PATCH 319/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 80 +++++++++++--------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 49600053..02c5b46c 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -45,7 +45,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -71,6 +71,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + @@ -100,16 +129,6 @@ - - - - - - - - - - @@ -231,35 +250,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - <%= subtitle_2 %> - - - - - @@ -381,7 +371,7 @@ - + @@ -455,7 +445,7 @@ - + @@ -472,7 +462,7 @@ - + @@ -529,7 +519,7 @@ - + From 5c445a982e4ddeabadc37ddb9db2fa511d2e1a55 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 11:38:13 +0100 Subject: [PATCH 320/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 125 +++++-------------------- 1 file changed, 26 insertions(+), 99 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 02c5b46c..99f8c1a3 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -55,8 +55,8 @@ - - + + @@ -84,7 +84,7 @@ - + @@ -303,11 +303,7 @@ - - - - - + <%= graph_1_title %> @@ -337,11 +333,7 @@ - - - - - + <%= graph_1_subtitle %> @@ -388,7 +380,7 @@ - + @@ -400,22 +392,14 @@ - - - - - + Male - - - - - + <%= @data[:genders]['m'] %> @@ -445,7 +429,7 @@ - + @@ -462,7 +446,7 @@ - + @@ -474,11 +458,7 @@ - - - - - + Female @@ -536,7 +516,7 @@ - + @@ -548,22 +528,14 @@ - - - - - + Other - - - - - + <%= @data[:genders][nil] %> @@ -593,11 +565,7 @@ - - - - - + <%= graph_2_title %> @@ -627,11 +595,7 @@ - - - - - + <%= graph_2_subtitle %> @@ -667,11 +631,7 @@ - - - - - + Total posts in market @@ -707,11 +667,7 @@ - - - - - + Time spent in market @@ -747,11 +703,7 @@ - - - - - + Image posts @@ -787,11 +739,7 @@ - - - - - + Video posts @@ -827,8 +775,7 @@ - - + Text posts @@ -864,11 +811,7 @@ - - - - - + <%= @data[:total_posts] %> @@ -904,11 +847,7 @@ - - - - - + <%= @data[:log_time] %> @@ -944,11 +883,7 @@ - - - - - + <%= @data[:post_types][:image] %> @@ -984,11 +919,7 @@ - - - - - + <%= @data[:post_types][:video] %> @@ -1024,11 +955,7 @@ - - - - - + <%= @data[:post_types][:text] %> From c627a92103dbff2d08ff0c3fc7504b2f61f247d6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 12:01:36 +0100 Subject: [PATCH 321/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 99f8c1a3..14f640ac 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -93,10 +93,9 @@ - + <%= subtitle_2 %> - From fe12ba1a2521cec8a08089cec986ebc40f5522e2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 12:25:38 +0100 Subject: [PATCH 322/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 14f640ac..4fa18007 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -78,7 +78,7 @@ - + From d8334ea6bdc1f1fe99c8b39338a0130fa832cbc6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 12:32:04 +0100 Subject: [PATCH 323/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 4fa18007..e1887f8b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -256,7 +256,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -547,7 +547,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -607,7 +607,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -679,7 +679,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -751,7 +751,7 @@ - + @@ -787,7 +787,7 @@ - + @@ -823,7 +823,7 @@ - + @@ -859,7 +859,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -931,7 +931,7 @@ - + From fb7a1f7a6c2f138990d148115b6e9dd99ac210bd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 13:33:58 +0100 Subject: [PATCH 324/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 711 ------------------------- 1 file changed, 711 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index e1887f8b..a97b16f1 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -249,717 +249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_1_title %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_1_subtitle %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Male - - - - - - - <%= @data[:genders]['m'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Female - - - - - - - - - - - <%= @data[:genders]['f'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Other - - - - - - - <%= @data[:genders][nil] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_2_title %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_2_subtitle %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Total posts in market - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Time spent in market - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Image posts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Video posts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Text posts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:total_posts] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:log_time] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:post_types][:image] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:post_types][:video] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= @data[:post_types][:text] %> - - - - From d56211ff21710287fcfb6a1f52e72e1d0adae740 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 13:36:51 +0100 Subject: [PATCH 325/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 89 ++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index a97b16f1..900eacc2 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -249,6 +249,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_subtitle %> + + + + From 75473df5a38aa51f5b649491e9b6820b5909f095 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 13:54:56 +0100 Subject: [PATCH 326/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 202 +++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 900eacc2..53ba5e37 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -338,6 +338,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Male + + + + + + + <%= @data[:genders]['m'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Female + + + + + + + + + + + <%= @data[:genders]['f'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Other + + + + + + + <%= @data[:genders][nil] %> + + + + From 346debe27ae6b63ecd7f4f9c3e447baf6d81a1d0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 14:01:12 +0100 Subject: [PATCH 327/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 136 ------------------------- 1 file changed, 136 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 53ba5e37..4ceb7d6b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -404,142 +404,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Female - - - - - - - - - - - <%= @data[:genders]['f'] %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Other - - - - - - - <%= @data[:genders][nil] %> - - - - From d4e6ab1d482e3e8834424f29c4b1612813c832e0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 14:05:29 +0100 Subject: [PATCH 328/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 37 -------------------------- 1 file changed, 37 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 4ceb7d6b..02d5aa0a 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -367,43 +367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Male - - - - - - - <%= @data[:genders]['m'] %> - - - - From d7c62e34f4581a6ac98019f45ea5db3a1602b924 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 14:09:30 +0100 Subject: [PATCH 329/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 02d5aa0a..0f768dd7 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -367,6 +367,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Male + + + + + + + <%= @data[:genders]['m'] %> + + + + + From e7fe736831ff64e91499c840d372bb26f4a85f5a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 14:12:57 +0100 Subject: [PATCH 330/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 557 ++++++++++++++++++++++++- 1 file changed, 556 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 0f768dd7..6878e0f2 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -404,7 +404,562 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Female + + + + + + + + + + + <%= @data[:genders]['f'] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Other + + + + + + + <%= @data[:genders][nil] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_2_title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_2_subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Total posts in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Time spent in market + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Image posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Video posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Text posts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:total_posts] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:log_time] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:image] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:video] %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= @data[:post_types][:text] %> + + + + From 7088525055a8417ac2ab691f1f2ce28c04eec3dc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 14:28:43 +0100 Subject: [PATCH 331/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6878e0f2..05d6869d 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -810,7 +810,8 @@ - + + <%= @data[:total_posts] %> @@ -846,7 +847,8 @@ - + + <%= @data[:log_time] %> @@ -882,7 +884,8 @@ - + + <%= @data[:post_types][:image] %> @@ -918,7 +921,8 @@ - + + <%= @data[:post_types][:video] %> @@ -926,7 +930,7 @@ - + @@ -954,7 +958,8 @@ - + + <%= @data[:post_types][:text] %> From 573dfaa4018c175516b4a6f6083b79e509db1494 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 15:02:29 +0100 Subject: [PATCH 332/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 60 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 05d6869d..b3ee6530 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -465,9 +465,6 @@ - - - <%= @data[:genders]['f'] %> @@ -630,7 +627,10 @@ - + + + + Total posts in market @@ -666,7 +666,10 @@ - + + + + Time spent in market @@ -702,7 +705,10 @@ - + + + + Image posts @@ -738,7 +744,10 @@ - + + + + Video posts @@ -774,7 +783,10 @@ - + + + + Text posts @@ -810,8 +822,10 @@ - - + + + + <%= @data[:total_posts] %> @@ -847,8 +861,10 @@ - - + + + + <%= @data[:log_time] %> @@ -884,8 +900,10 @@ - - + + + + <%= @data[:post_types][:image] %> @@ -921,8 +939,10 @@ - - + + + + <%= @data[:post_types][:video] %> @@ -956,10 +976,12 @@ - + - - + + + + <%= @data[:post_types][:text] %> From 99b4a88350d3b88d271f6ea9fe3ea0b73b5cc3a4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 16:38:09 +0100 Subject: [PATCH 333/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index b3ee6530..eada98c4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -291,7 +291,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -667,7 +667,7 @@ - + Time spent in market @@ -706,7 +706,7 @@ - + Image posts @@ -745,7 +745,7 @@ - + Video posts @@ -784,7 +784,7 @@ - + Text posts @@ -823,7 +823,7 @@ - + <%= @data[:total_posts] %> @@ -862,7 +862,7 @@ - + <%= @data[:log_time] %> @@ -901,7 +901,7 @@ - + <%= @data[:post_types][:image] %> @@ -940,7 +940,7 @@ - + <%= @data[:post_types][:video] %> @@ -979,7 +979,7 @@ - + <%= @data[:post_types][:text] %> From 2acb2ec58ccc7eec325a752cd342852da0017d6d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 16:54:28 +0100 Subject: [PATCH 334/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 86 ++++++++++++++------------ 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index eada98c4..8ee01ca4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -291,7 +291,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -705,10 +705,11 @@ - - - - + + + + + Image posts @@ -744,10 +745,11 @@ - - - - + + + + + Video posts @@ -783,10 +785,11 @@ - - - - + + + + + Text posts @@ -822,10 +825,11 @@ - - - - + + + + + <%= @data[:total_posts] %> @@ -861,10 +865,11 @@ - - - - + + + + + <%= @data[:log_time] %> @@ -900,10 +905,11 @@ - - - - + + + + + <%= @data[:post_types][:image] %> @@ -939,10 +945,11 @@ - - - - + + + + + <%= @data[:post_types][:video] %> @@ -978,10 +985,11 @@ - - - - + + + + + <%= @data[:post_types][:text] %> From 4b852e5cc6246d47b19af41fe518ac9cfaca9fa2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:00:22 +0100 Subject: [PATCH 335/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 8ee01ca4..334d97bd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -362,7 +362,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -627,10 +627,11 @@ - - - - + + + + + Total posts in market @@ -666,10 +667,11 @@ - - - - + + + + + Time spent in market From b8bafd455b6e073a6252303c9e4c936363f2129c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:07:15 +0100 Subject: [PATCH 336/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 334d97bd..48af30d4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -27,7 +27,7 @@ - + @@ -496,7 +496,7 @@ - + From d53f24bf9f408e671afb7aad9217322ad032b14c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:11:15 +0100 Subject: [PATCH 337/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 48af30d4..89d218ca 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -27,7 +27,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -512,7 +512,7 @@ - + From ca1767daa19fb14430232d15ece02949aa05a713 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:16:53 +0100 Subject: [PATCH 338/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 89d218ca..39a7c129 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -27,7 +27,7 @@ - + @@ -512,7 +512,7 @@ - + From 6a1c22a552a6d58c92b432c8f602c5616ef772eb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:19:17 +0100 Subject: [PATCH 339/561] posts details --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 39a7c129..5261a131 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -579,7 +579,7 @@ - + From 849bf17b3428972e043c2c05e420e2019f3bf036 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Wed, 3 Feb 2021 17:36:21 +0100 Subject: [PATCH 340/561] dashboard details --- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index eb9045ad..ee65a6fb 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -27,7 +27,7 @@ - + From 1329b88d29451a7c1e1f767b581e48d84b5283fe Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 10:47:24 +0100 Subject: [PATCH 341/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 5780e313..b8384939 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -17,7 +17,10 @@ def initialize(options={}) end def save(extract_path, index) + puts extract_path + puts '----------------->' @images.each do |image| + puts image[0] copy_media(extract_path, image[0]) end From 0bb45e935f342399dd14c68b87433313f00e08f6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 10:52:47 +0100 Subject: [PATCH 342/561] dashboard details --- lib/powerpoint/util.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index 884ca044..bb0fa1b1 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -23,6 +23,9 @@ def require_arguments(required_arguements, arguements) end def copy_media(extract_path, image_path) + puts extract_path + puts image_path + puts '-------------------------->' image_name = File.basename(image_path) dest_path = "#{extract_path}/ppt/media/#{image_name}" FileUtils.copy_file(image_path, dest_path) unless File.exist?(dest_path) From 96c6f414e9a58e8f65e0d01809905db1abe0a868 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 10:57:29 +0100 Subject: [PATCH 343/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index b8384939..5780e313 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -17,10 +17,7 @@ def initialize(options={}) end def save(extract_path, index) - puts extract_path - puts '----------------->' @images.each do |image| - puts image[0] copy_media(extract_path, image[0]) end From 0ecea1220b1276dadf2842466f7cbf58bd8110c4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:20:29 +0100 Subject: [PATCH 344/561] dashboard details --- lib/powerpoint/presentation.rb | 2 ++ lib/powerpoint/util.rb | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 052cf4a7..db695c5c 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,6 +49,8 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) + puts logo + puts '-------------------->' @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end diff --git a/lib/powerpoint/util.rb b/lib/powerpoint/util.rb index bb0fa1b1..884ca044 100644 --- a/lib/powerpoint/util.rb +++ b/lib/powerpoint/util.rb @@ -23,9 +23,6 @@ def require_arguments(required_arguements, arguements) end def copy_media(extract_path, image_path) - puts extract_path - puts image_path - puts '-------------------------->' image_name = File.basename(image_path) dest_path = "#{extract_path}/ppt/media/#{image_name}" FileUtils.copy_file(image_path, dest_path) unless File.exist?(dest_path) From 5fb9ab4b5e2a9ec1c6b35d05a07dff7e91fc7b89 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:20:57 +0100 Subject: [PATCH 345/561] dashboard details --- lib/powerpoint/presentation.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index db695c5c..b31049ec 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,8 +49,9 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) + puts '-------logo------------->' puts logo - puts '-------------------->' + puts '-------logo------------->' @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end From 0d76e683661d0f83e40dad2e486101e39db918a8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:25:43 +0100 Subject: [PATCH 346/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 5780e313..c2eb82ea 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -11,9 +11,13 @@ class MultipleImage attr_reader :title, :subtitle,:subtitle_2, :logo, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2,:logo, :images], options + require_arguments [:title, :subtitle,:subtitle_2, :logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images + puts '---------logo_2--------->' + puts logo + puts '---------------------->' + @logo = logo end def save(extract_path, index) From 0b17f9ad5050e0a99403317edc35c093bf3b490a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:29:01 +0100 Subject: [PATCH 347/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index c2eb82ea..1a1e8610 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -14,10 +14,6 @@ def initialize(options={}) require_arguments [:title, :subtitle,:subtitle_2, :logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - puts '---------logo_2--------->' - puts logo - puts '---------------------->' - @logo = logo end def save(extract_path, index) From ebb8499433804ab9bd8cc20142695bc2f33dab69 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:29:32 +0100 Subject: [PATCH 348/561] dashboard details --- lib/powerpoint/presentation.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index b31049ec..052cf4a7 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,9 +49,6 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - puts '-------logo------------->' - puts logo - puts '-------logo------------->' @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end From 41d1f52cfb544abfd107f3be86cdcc8632311312 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:30:48 +0100 Subject: [PATCH 349/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 1a1e8610..48a5b7ac 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -17,6 +17,7 @@ def initialize(options={}) end def save(extract_path, index) + puts images.inspect @images.each do |image| copy_media(extract_path, image[0]) end From 0fa6c1b37b4451a424ef8b7d957ae881bb70a2be Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:33:23 +0100 Subject: [PATCH 350/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 48a5b7ac..0ac3f3fc 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -17,7 +17,7 @@ def initialize(options={}) end def save(extract_path, index) - puts images.inspect + puts @images.inspect @images.each do |image| copy_media(extract_path, image[0]) end From 6df3fdc1b3e4799f83fdcc72bc05e03858e45298 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:47:04 +0100 Subject: [PATCH 351/561] dashboard details --- lib/powerpoint/slide/multiple_image.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 0ac3f3fc..f084fcd6 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -17,13 +17,16 @@ def initialize(options={}) end def save(extract_path, index) - puts @images.inspect @images.each do |image| copy_media(extract_path, image[0]) end copy_media(extract_path, logo) + puts 'index' + puts index.inspect + puts 'index' + save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end From c7d0a8899d4700138c8251375b6cdae658cc21bf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:48:31 +0100 Subject: [PATCH 352/561] dashboard details --- lib/powerpoint/presentation.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 052cf4a7..fa53143d 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -84,6 +84,8 @@ def save(path) # Save slides slides.each_with_index do |slide, index| + puts slides + puts '--------------------->' slide.save(extract_path, index + 1) end From 32dd94f216fa2f2a69e7d3c42ec3c15369f6cd3f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 11:54:03 +0100 Subject: [PATCH 353/561] dashboard details --- lib/powerpoint/presentation.rb | 2 -- lib/powerpoint/slide/multiple_image.rb | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index fa53143d..052cf4a7 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -84,8 +84,6 @@ def save(path) # Save slides slides.each_with_index do |slide, index| - puts slides - puts '--------------------->' slide.save(extract_path, index + 1) end diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index f084fcd6..c3130937 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -18,15 +18,16 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| + puts image.inspect + puts '----------------image----------------' copy_media(extract_path, image[0]) end + + puts logo.inspect + puts '----------------logo----------------' copy_media(extract_path, logo) - puts 'index' - puts index.inspect - puts 'index' - save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end From 3274925755b8fff0928ba2eaa4f948553a50de2f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 12:47:32 +0100 Subject: [PATCH 354/561] dashboard details --- lib/powerpoint.rb | 2 + lib/powerpoint/presentation.rb | 4 + lib/powerpoint/slide/concept.rb | 41 +++++ lib/powerpoint/slide/multiple_image.rb | 5 - lib/powerpoint/views/concept.xml.erb | 215 +++++++++++++++++++++++ lib/powerpoint/views/concept_rel.xml.erb | 8 + 6 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 lib/powerpoint/slide/concept.rb create mode 100644 lib/powerpoint/views/concept.xml.erb create mode 100644 lib/powerpoint/views/concept_rel.xml.erb diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index d1de160d..b345027e 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -3,6 +3,7 @@ require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/multiple_image' +require 'powerpoint/concept' require 'powerpoint/slide/image' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' @@ -13,6 +14,7 @@ require 'powerpoint/compression' require 'powerpoint/presentation' + module Powerpoint ROOT_PATH = File.expand_path("../..", __FILE__) TEMPLATE_PATH = "#{ROOT_PATH}/template/" diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 052cf4a7..ad19775c 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,6 +52,10 @@ def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,imag @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end + def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + end + def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb new file mode 100644 index 00000000..f309f776 --- /dev/null +++ b/lib/powerpoint/slide/concept.rb @@ -0,0 +1,41 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Concept + include Powerpoint::Util + + attr_reader :title, :subtitle,:subtitle_2, :logo, :images + + def initialize(options={}) + require_arguments [:title, :subtitle,:subtitle_2, :logo, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @images = images + end + + def save(extract_path, index) + @images.each do |image| + copy_media(extract_path, image[0]) + end + + copy_media(extract_path, logo) + + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def save_rel_xml(extract_path, index) + render_view('concept_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('concept.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index c3130937..71f7eefb 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -18,14 +18,9 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| - puts image.inspect - puts '----------------image----------------' copy_media(extract_path, image[0]) end - puts logo.inspect - puts '----------------logo----------------' - copy_media(extract_path, logo) save_rel_xml(extract_path, index) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb new file mode 100644 index 00000000..2cb61375 --- /dev/null +++ b/lib/powerpoint/views/concept.xml.erb @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle_2 %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% y_coords = 2664490 %> + <% x_coords = 2349630 %> + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Position: <%= index +1 %> + + + + + + + Votes: <%= image[1] %> + + + + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb new file mode 100644 index 00000000..c30e7724 --- /dev/null +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -0,0 +1,8 @@ + + + + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% images.each_with_index do |image, index| %> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% end %> + \ No newline at end of file From d2c1d4b5ac4b0c8c745f5ff64c848baba3bafaee Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 13:56:32 +0100 Subject: [PATCH 355/561] dashboard details --- lib/powerpoint.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index b345027e..8b2a1f96 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -3,7 +3,7 @@ require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/multiple_image' -require 'powerpoint/concept' +require 'powerpoint/slide/concept' require 'powerpoint/slide/image' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' From 1e9ea0588ba154496739edfe8bb7fc0125c036ed Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Feb 2021 18:24:44 +0100 Subject: [PATCH 356/561] dashboard details --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index f309f776..52727ffb 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -18,7 +18,7 @@ def initialize(options={}) def save(extract_path, index) @images.each do |image| - copy_media(extract_path, image[0]) + copy_media(extract_path, image) end copy_media(extract_path, logo) From ba534d12416953595c8da2861d16fdc3077663c7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 10:14:44 +0100 Subject: [PATCH 357/561] dashboard details --- lib/powerpoint/slide/concept.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 52727ffb..5742c3a5 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -17,6 +17,9 @@ def initialize(options={}) end def save(extract_path, index) + puts 'images' + puts @images + pus '------------>' @images.each do |image| copy_media(extract_path, image) end From 07f9c3742aa2c00c0204880ed794344d533e5e65 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 11:13:50 +0100 Subject: [PATCH 358/561] dashboard details --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/slide/concept.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index ad19775c..04a98121 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -53,7 +53,7 @@ def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,imag end def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end def add_image_slide(title, subtitle = nil,images) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 5742c3a5..e2855d1d 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -18,7 +18,7 @@ def initialize(options={}) def save(extract_path, index) puts 'images' - puts @images + puts @images.inspect pus '------------>' @images.each do |image| copy_media(extract_path, image) From d7a7709e7f63973eac1f58f2173faff3bf024230 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 11:27:18 +0100 Subject: [PATCH 359/561] dashboard details --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index e2855d1d..70ea88dc 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -19,7 +19,7 @@ def initialize(options={}) def save(extract_path, index) puts 'images' puts @images.inspect - pus '------------>' + puts '------------>' @images.each do |image| copy_media(extract_path, image) end From d56e30614a18dc9d4aff29022bda8a56e6888737 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 11:53:03 +0100 Subject: [PATCH 360/561] dashboard details --- lib/powerpoint/slide/concept.rb | 3 --- lib/powerpoint/views/concept_rel.xml.erb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 70ea88dc..52727ffb 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -17,9 +17,6 @@ def initialize(options={}) end def save(extract_path, index) - puts 'images' - puts @images.inspect - puts '------------>' @images.each do |image| copy_media(extract_path, image) end diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb index c30e7724..4706f328 100644 --- a/lib/powerpoint/views/concept_rel.xml.erb +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -3,6 +3,6 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From 9ec1316d2c688e68205fb9adacdc7dae62981908 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 13:28:29 +0100 Subject: [PATCH 361/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 2cb61375..e486f5a7 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -175,31 +175,12 @@ - + - - - - - - - - - Position: <%= index +1 %> - - - - - - - Votes: <%= image[1] %> - - - <% end %> From 7867e4095e0d72aecbea8a882fccb4f40cb537da Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 13:53:54 +0100 Subject: [PATCH 362/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index e486f5a7..2a2f65d8 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -153,7 +153,7 @@ - + @@ -161,27 +161,6 @@ - - - - - - - - - - - - - - - - - - - - - <% end %> From 0461132229697dfef3104f274593ba5c825f8808 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 14:11:41 +0100 Subject: [PATCH 363/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 2a2f65d8..5b38cafa 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -154,7 +154,7 @@ - + From 85718d3ea464ae45c696c663c0cd702cb4c71b60 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 14:14:27 +0100 Subject: [PATCH 364/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 5b38cafa..9beeef1d 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -128,8 +128,6 @@ - <% y_coords = 2664490 %> - <% x_coords = 2349630 %> <% images.each_with_index do |image, index| %> From 9471c6be0a2bed6ca81aa2f1538c1031b203ea07 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 15:13:32 +0100 Subject: [PATCH 365/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 9beeef1d..4b1efdd2 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -152,7 +152,7 @@ - + From ca573ec6c3508deb31d6448cfc5532a1636f9c27 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 15:20:46 +0100 Subject: [PATCH 366/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 4b1efdd2..5af62d35 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -56,7 +56,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -152,7 +152,7 @@ - + From ed64acec2e1a50bfb4ec9d02d4e121f30ae3b737 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Feb 2021 16:17:19 +0100 Subject: [PATCH 367/561] concept eval --- lib/powerpoint/views/concept.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 5af62d35..42d0a478 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -151,8 +151,8 @@ - - + + From 458aa8bfdd27c5f1274751782d47fa28636dc4d4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 12:40:25 +0100 Subject: [PATCH 368/561] concept eval --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/concept.rb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 04a98121..b7508a37 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,8 +48,8 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo, image_ratio ,images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_ratio: image_ratio, images: images) end def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 52727ffb..e58ff2c3 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,12 +8,13 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :logo, :images + attr_reader :title, :subtitle,:subtitle_2, :logo, :image_ratio :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2, :logo, :images], options + require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_ratio, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images + @image_ratio end def save(extract_path, index) From 7a1049d856680a3be9684e8845359402ffd0c819 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 14:14:07 +0100 Subject: [PATCH 369/561] concept eval --- lib/powerpoint/slide/concept.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index e58ff2c3..0997f168 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,13 +8,13 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :logo, :image_ratio :images + attr_reader :title, :subtitle,:subtitle_2, :logo, :image_information, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_ratio, :images], options + require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - @image_ratio + end def save(extract_path, index) @@ -28,6 +28,14 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end + def image_ratio(image_information) + if image_information[0] > image_information[1] + image_ratio = ['width',image_information[2]] + else + image_ratio = ['height',image_information[2]] + end + end + def save_rel_xml(extract_path, index) render_view('concept_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end From d82933a21c32d049896d2ba971873692d26a31d7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 14:34:44 +0100 Subject: [PATCH 370/561] concept eval --- lib/powerpoint/presentation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index b7508a37..f43211a5 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,11 +49,11 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo, image_ratio ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_ratio: image_ratio, images: images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, , image_ratio: image_ratio, images: images) end def add_image_slide(title, subtitle = nil,images) From ba4f0c04295cbed60a0798ab3327452f4cc7a0d9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 15:10:21 +0100 Subject: [PATCH 371/561] concept eval --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index f43211a5..37f112dc 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -53,7 +53,7 @@ def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo, imag end def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, , image_ratio: image_ratio, images: images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_ratio: image_ratio, images: images) end def add_image_slide(title, subtitle = nil,images) From e3f7a55525a89e6d8721cfedffc008584a89aa4c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 15:19:51 +0100 Subject: [PATCH 372/561] concept eval --- lib/powerpoint/presentation.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 37f112dc..3e6b84e1 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,12 +48,12 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo, image_ratio ,images) + def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) end - def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_ratio: image_ratio, images: images) + def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo, image_information ,images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_information: image_information, images: images) end def add_image_slide(title, subtitle = nil,images) From 574dcd071a4c26c0af2f32b506a2ebedcc05c01c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 16:07:10 +0100 Subject: [PATCH 373/561] scale --- lib/powerpoint/slide/concept.rb | 25 +++++++++++++++++-------- lib/powerpoint/views/concept.xml.erb | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 0997f168..c98c3dbd 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -14,7 +14,23 @@ def initialize(options={}) require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - + slide_y = 5735412 + slide_x = 11470824 + slide_x_offset = 360588 + slide_y_offset = 1283763 + #image information = [width, height, ratio] + # if image is taller than wider + if (image_information[2] < 1) + @image_y_scale = slide_y + @image_x_scale = slide_y * image_information[2] + @image_x_offset = slide_x_offset - ((slide_x - @image_x_scale) / 2) + @image_y_offset = slide_y_offset + else + @image_y_scale = slide_x / image_information[2] + @image_x_scale = slide_x + @image_x_offset = slide_x_offset + @image_y_offset = slide_y_offset + ((slide_y - @image_y_scale)/2) + end end def save(extract_path, index) @@ -28,13 +44,6 @@ def save(extract_path, index) save_slide_xml(extract_path, index) end - def image_ratio(image_information) - if image_information[0] > image_information[1] - image_ratio = ['width',image_information[2]] - else - image_ratio = ['height',image_information[2]] - end - end def save_rel_xml(extract_path, index) render_view('concept_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 42d0a478..c4338353 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -151,8 +151,8 @@ - - + + From 50ee8ffb911cf6da578f1e8dd0689c66b90e7316 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 17:03:06 +0100 Subject: [PATCH 374/561] scale --- lib/powerpoint/slide/concept.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index c98c3dbd..6e3c07bc 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -22,14 +22,14 @@ def initialize(options={}) # if image is taller than wider if (image_information[2] < 1) @image_y_scale = slide_y - @image_x_scale = slide_y * image_information[2] - @image_x_offset = slide_x_offset - ((slide_x - @image_x_scale) / 2) + @image_x_scale = (slide_y * image_information[2]).round + @image_x_offset = (slide_x_offset - ((slide_x - @image_x_scale) / 2).round @image_y_offset = slide_y_offset else - @image_y_scale = slide_x / image_information[2] + @image_y_scale = (slide_x * image_information[2]).round @image_x_scale = slide_x @image_x_offset = slide_x_offset - @image_y_offset = slide_y_offset + ((slide_y - @image_y_scale)/2) + @image_y_offset = (slide_y_offset + ((slide_y - @image_y_scale)/2)).round end end From ffabec0d87844b78a6909c98e685f02f54e17739 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 17:27:19 +0100 Subject: [PATCH 375/561] scale --- lib/powerpoint/slide/concept.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 6e3c07bc..a5334d2d 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -19,11 +19,11 @@ def initialize(options={}) slide_x_offset = 360588 slide_y_offset = 1283763 #image information = [width, height, ratio] - # if image is taller than wider + # if image is taller than it is wider if (image_information[2] < 1) @image_y_scale = slide_y @image_x_scale = (slide_y * image_information[2]).round - @image_x_offset = (slide_x_offset - ((slide_x - @image_x_scale) / 2).round + @image_x_offset = (slide_x_offset - ((slide_x - @image_x_scale) / 2)).round @image_y_offset = slide_y_offset else @image_y_scale = (slide_x * image_information[2]).round From deec1d2f9870ec13fd90ab6269eab430fbcf86fe Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 17:49:58 +0100 Subject: [PATCH 376/561] scale --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index a5334d2d..829f2f48 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -26,7 +26,7 @@ def initialize(options={}) @image_x_offset = (slide_x_offset - ((slide_x - @image_x_scale) / 2)).round @image_y_offset = slide_y_offset else - @image_y_scale = (slide_x * image_information[2]).round + @image_y_scale = (slide_x / image_information[2]).round @image_x_scale = slide_x @image_x_offset = slide_x_offset @image_y_offset = (slide_y_offset + ((slide_y - @image_y_scale)/2)).round From 20e6dde14e3cb94eb6a17c592f8e7689b701a24d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Feb 2021 18:13:00 +0100 Subject: [PATCH 377/561] scale --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 829f2f48..8d20251b 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -23,7 +23,7 @@ def initialize(options={}) if (image_information[2] < 1) @image_y_scale = slide_y @image_x_scale = (slide_y * image_information[2]).round - @image_x_offset = (slide_x_offset - ((slide_x - @image_x_scale) / 2)).round + @image_x_offset = (slide_x_offset + ((slide_x - @image_x_scale) / 2)).round @image_y_offset = slide_y_offset else @image_y_scale = (slide_x / image_information[2]).round From b3e9b91fa72e95553ebf9997e4eb598511aa715a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 9 Feb 2021 10:16:31 +0100 Subject: [PATCH 378/561] scale --- lib/powerpoint/slide/concept.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 8d20251b..a24b4d7d 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -14,9 +14,9 @@ def initialize(options={}) require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - slide_y = 5735412 - slide_x = 11470824 - slide_x_offset = 360588 + slide_y = 5535412 + slide_x = 11070824 + slide_x_offset = 560588 slide_y_offset = 1283763 #image information = [width, height, ratio] # if image is taller than it is wider From dc07ff62d36ab46fdf4b0c43e06ebcfa6d44266e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 9 Feb 2021 13:55:32 +0100 Subject: [PATCH 379/561] scale --- lib/powerpoint/slide/concept.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index a24b4d7d..39fb87a2 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -31,6 +31,11 @@ def initialize(options={}) @image_x_offset = slide_x_offset @image_y_offset = (slide_y_offset + ((slide_y - @image_y_scale)/2)).round end + + puts @image_y_scale + puts @image_x_scale + puts @image_x_offset + puts @image_y_offset end def save(extract_path, index) From d5f03b246468ff07baa1d5ffe5553cc0c421a1d6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 9 Feb 2021 16:13:05 +0100 Subject: [PATCH 380/561] scale --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 39fb87a2..17b54e9d 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -20,7 +20,7 @@ def initialize(options={}) slide_y_offset = 1283763 #image information = [width, height, ratio] # if image is taller than it is wider - if (image_information[2] < 1) + if (image_information[2] < 2) @image_y_scale = slide_y @image_x_scale = (slide_y * image_information[2]).round @image_x_offset = (slide_x_offset + ((slide_x - @image_x_scale) / 2)).round From af416d946250648f14163a3428c79e937169fe68 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 10:48:17 +0100 Subject: [PATCH 381/561] move logic from templater --- lib/powerpoint/slide/concept.rb | 5 ----- lib/powerpoint/views/multiple_image.xml.erb | 8 ++++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 17b54e9d..d0febbeb 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -31,11 +31,6 @@ def initialize(options={}) @image_x_offset = slide_x_offset @image_y_offset = (slide_y_offset + ((slide_y - @image_y_scale)/2)).round end - - puts @image_y_scale - puts @image_x_scale - puts @image_x_offset - puts @image_y_offset end def save(extract_path, index) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 2cb61375..2517d281 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -186,19 +186,23 @@ + <% if image[1].present? %> - Position: <%= index +1 %> + <%= image[2] %> + <% end %> + <% if image[1].present? %> - Votes: <%= image[1] %> + <%= image[1] %> + <% end %> <% end %> From e1efe7845c1faa76931a4f74c8622a7fc5e2a495 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 16:00:18 +0100 Subject: [PATCH 382/561] image logo --- lib/powerpoint/presentation.rb | 16 ++--- lib/powerpoint/slide/concept.rb | 5 +- lib/powerpoint/slide/dashboard.rb | 6 +- lib/powerpoint/slide/dashboard_user.rb | 5 +- lib/powerpoint/slide/multiple_image.rb | 5 +- lib/powerpoint/views/concept.xml.erb | 57 ++++++++--------- lib/powerpoint/views/concept_rel.xml.erb | 3 +- lib/powerpoint/views/dashboard.xml.erb | 63 ++++++++++--------- lib/powerpoint/views/dashboard_rel.xml.erb | 1 + lib/powerpoint/views/dashboard_user.xml.erb | 51 +++++++-------- .../views/dashboard_user_rel.xml.erb | 1 + lib/powerpoint/views/multiple_image.xml.erb | 49 ++++++++------- .../views/multiple_image_rel.xml.erb | 3 +- 13 files changed, 139 insertions(+), 126 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 3e6b84e1..bdc761c3 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,24 +48,24 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_multiple_image_slide(title, subtitle = nil, subtitle_2 = nil, logo ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, images: images) + def add_multiple_image_slide(title, subtitle = nil, logo, task_icon ,images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, task_icon: task_icon, logo: logo, images: images) end - def add_concept_slide(title, subtitle = nil, subtitle_2 = nil, logo, image_information ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, logo: logo, image_information: image_information, images: images) + def add_concept_slide(title, subtitle = nil, logo, task_icon, image_information ,images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, logo: logo, task_icon: task_icon, image_information: image_information, images: images) end def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, subtitle_2 = nil, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, data: data) + def add_dashboard_slide(title, subtitle = nil, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, logo, data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) end - def add_dashboard_user_slide(title, subtitle = nil, subtitle_2 = nil, images) - @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle, subtitle_2: subtitle_2, images: images) + def add_dashboard_user_slide(title, subtitle = nil, logo, images) + @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle, logo: logo, images: images) end def save(path) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index d0febbeb..7ffc1214 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,10 +8,10 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :logo, :image_information, :images + attr_reader :title, :subtitle,:logo, :task_icon, :image_information, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2, :logo, :image_information, :images], options + require_arguments [:title, :subtitle,:logo, :task_icon, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images slide_y = 5535412 @@ -39,6 +39,7 @@ def save(extract_path, index) end copy_media(extract_path, logo) + copy_media(extract_path, task_icon) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 47960bf0..52321de9 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,16 +8,17 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :data + attr_reader :title, :subtitle, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :logo, :data def initialize(options={}) - require_arguments [:title, :subtitle, :subtitle_2, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :data], options + require_arguments [:title, :subtitle, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(@image_path) @image_name_2 = File.basename(@image_path_2) @image_name_3 = File.basename(@image_path_3) @image_name_4 = File.basename(@image_path_4) + @logo = File.basename(@logo) end def save(extract_path, index) @@ -25,6 +26,7 @@ def save(extract_path, index) copy_media(extract_path, @image_path_2) copy_media(extract_path, @image_path_3) copy_media(extract_path, @image_path_4) + copy_media(extract_path, logo) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index efdd5d0b..ec3f49dd 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -8,12 +8,13 @@ module Slide class DashboardUser include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :images + attr_reader :title, :subtitle,:logo, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2, :images], options + require_arguments [:title, :subtitle,:logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images + @logo = File.basename(@logo) end def save(extract_path, index) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 71f7eefb..18bc1364 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -8,10 +8,10 @@ module Slide class MultipleImage include Powerpoint::Util - attr_reader :title, :subtitle,:subtitle_2, :logo, :images + attr_reader :title, :subtitle, :logo, :task_icon, :images def initialize(options={}) - require_arguments [:title, :subtitle,:subtitle_2, :logo, :images], options + require_arguments [:title, :subtitle, :logo, :task_icon, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images end @@ -22,6 +22,7 @@ def save(extract_path, index) end copy_media(extract_path, logo) + copy_media(extract_path, task_icon) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index c4338353..1efd9f05 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -55,8 +55,8 @@ - - + + @@ -71,34 +71,35 @@ - - - - - - + + + + + + - + - + + + + + + + + + + + + + - - + + - - - - - - - - <%= subtitle_2 %> - - - - + @@ -110,7 +111,7 @@ - + @@ -123,15 +124,15 @@ - - + + <% images.each_with_index do |image, index| %> - + diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb index 4706f328..6f648b9c 100644 --- a/lib/powerpoint/views/concept_rel.xml.erb +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -2,7 +2,8 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 5261a131..7c97caa5 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -45,7 +45,7 @@ - + @@ -55,8 +55,8 @@ - - + + @@ -71,34 +71,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - <%= subtitle_2 %> - - - - @@ -249,6 +221,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/powerpoint/views/dashboard_rel.xml.erb b/lib/powerpoint/views/dashboard_rel.xml.erb index c64899a6..d5ce6abb 100644 --- a/lib/powerpoint/views/dashboard_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_rel.xml.erb @@ -5,4 +5,5 @@ + \ No newline at end of file diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index ee65a6fb..993bf56e 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -55,8 +55,8 @@ - - + + @@ -71,40 +71,41 @@ - - - - - - + + + + + + - + - + + + + + + + + + + + + + - - + + - - - - - - - - <%= subtitle_2 %> - - - - + <% y_coords = 2664490 %> <% x_coords = 3849630 %> <% images.each_with_index do |image, index| %> - + diff --git a/lib/powerpoint/views/dashboard_user_rel.xml.erb b/lib/powerpoint/views/dashboard_user_rel.xml.erb index 7f16edfe..d1fa3c1b 100644 --- a/lib/powerpoint/views/dashboard_user_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_user_rel.xml.erb @@ -1,6 +1,7 @@ + <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 2517d281..f398b2a0 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -71,34 +71,35 @@ - - - - - - + + + + + + - + - + + + + + + + + + + + + + - - + + - - - - - - - - <%= subtitle_2 %> - - - - + @@ -110,7 +111,7 @@ - + @@ -146,7 +147,7 @@ - + diff --git a/lib/powerpoint/views/multiple_image_rel.xml.erb b/lib/powerpoint/views/multiple_image_rel.xml.erb index c30e7724..412f4699 100644 --- a/lib/powerpoint/views/multiple_image_rel.xml.erb +++ b/lib/powerpoint/views/multiple_image_rel.xml.erb @@ -2,7 +2,8 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> \ No newline at end of file From 3c3243aaadfbec0970ad27d24cb5037a79761bfc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 16:42:39 +0100 Subject: [PATCH 383/561] image logo --- lib/powerpoint/slide/dashboard_user.rb | 2 +- lib/powerpoint/views/multiple_image.xml.erb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index ec3f49dd..548ff635 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -21,7 +21,7 @@ def save(extract_path, index) @images.each do |image| copy_media(extract_path, image[1]) end - + copy_media(extract_path, logo) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index f398b2a0..97498eba 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -55,8 +55,8 @@ - - + + @@ -95,8 +95,8 @@ - - + + @@ -124,8 +124,8 @@ - - + + From 884e485f738071a5cfa3e6ba1604b1cdc483e0ba Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 17:55:41 +0100 Subject: [PATCH 384/561] page numbers --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/slide/dashboard.rb | 2 +- lib/powerpoint/slide/multiple_image.rb | 4 +-- lib/powerpoint/views/multiple_image.xml.erb | 30 ++++++++++++++++++++- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index bdc761c3..0c880bf7 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -48,7 +48,7 @@ def add_picture_description_slide(title, image_path, content = []) @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content) end - def add_multiple_image_slide(title, subtitle = nil, logo, task_icon ,images) + def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon ,images) @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, task_icon: task_icon, logo: logo, images: images) end diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 52321de9..7da1d08e 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -26,7 +26,7 @@ def save(extract_path, index) copy_media(extract_path, @image_path_2) copy_media(extract_path, @image_path_3) copy_media(extract_path, @image_path_4) - copy_media(extract_path, logo) + copy_media(extract_path, @logo) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 18bc1364..532e92c9 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -8,10 +8,10 @@ module Slide class MultipleImage include Powerpoint::Util - attr_reader :title, :subtitle, :logo, :task_icon, :images + attr_reader :title, :subtitle, :page_number :logo, :task_icon, :images def initialize(options={}) - require_arguments [:title, :subtitle, :logo, :task_icon, :images], options + require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images end diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 97498eba..93f16fd7 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -63,7 +63,7 @@ - + <%= subtitle %> @@ -71,6 +71,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + <%= page_number %> + + + + From df2c323dec5763ecfdb62fc2ee55a03faab52c1e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 17:57:00 +0100 Subject: [PATCH 385/561] page numbers --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 93f16fd7..c36409c5 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -153,7 +153,7 @@ - + From 87bca345de713882d68da0d26bfe8df3c1e44d95 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 18:33:40 +0100 Subject: [PATCH 386/561] page numbers --- lib/powerpoint/slide/multiple_image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/multiple_image.rb b/lib/powerpoint/slide/multiple_image.rb index 532e92c9..1cd7350c 100644 --- a/lib/powerpoint/slide/multiple_image.rb +++ b/lib/powerpoint/slide/multiple_image.rb @@ -8,7 +8,7 @@ module Slide class MultipleImage include Powerpoint::Util - attr_reader :title, :subtitle, :page_number :logo, :task_icon, :images + attr_reader :title, :subtitle, :page_number, :logo, :task_icon, :images def initialize(options={}) require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :images], options From 703dfcbbfdb9a16e476dec994f613e4307cf78d1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 11 Feb 2021 18:50:45 +0100 Subject: [PATCH 387/561] page numbers --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 0c880bf7..f5e9ca2c 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,7 +49,7 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, task_icon: task_icon, logo: logo, images: images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle,page_number: page_number, task_icon: task_icon, logo: logo, images: images) end def add_concept_slide(title, subtitle = nil, logo, task_icon, image_information ,images) From 6c74fa463a2b44648d4ec99f63f191c7ac4103d4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 10:24:57 +0100 Subject: [PATCH 388/561] page numbers --- lib/powerpoint/presentation.rb | 2 +- lib/powerpoint/views/multiple_image.xml.erb | 32 ++++++++------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index f5e9ca2c..51469988 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -49,7 +49,7 @@ def add_picture_description_slide(title, image_path, content = []) end def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle,page_number: page_number, task_icon: task_icon, logo: logo, images: images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end def add_concept_slide(title, subtitle = nil, logo, task_icon, image_information ,images) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c36409c5..1bc3a07f 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -17,7 +17,7 @@ - + @@ -45,13 +45,10 @@ - + - - - @@ -73,7 +70,7 @@ - + @@ -101,7 +98,7 @@ - + @@ -123,14 +120,14 @@ - - + + - + @@ -152,7 +149,7 @@ - + @@ -192,15 +189,10 @@ - - - - - - - - - + + + + From de8383b81f75d317e1809db7cb7642199913bf33 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 10:48:06 +0100 Subject: [PATCH 389/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 1bc3a07f..30d8dbd3 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -121,7 +121,7 @@ - + @@ -150,7 +150,7 @@ - + From f2b34167bad2efde2076319c92a1beb2fabf2276 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 10:55:17 +0100 Subject: [PATCH 390/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 30d8dbd3..6fc8ec45 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -49,6 +49,9 @@ + + + @@ -121,7 +124,7 @@ - + @@ -150,7 +153,7 @@ - + @@ -189,10 +192,15 @@ - - - - + + + + + + + + + From 10b07b3a3929d28943c0557ce7d617361c4290bc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 10:57:46 +0100 Subject: [PATCH 391/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6fc8ec45..7112da15 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -192,13 +192,7 @@ - - - - - - - + From 7e5c10d10e6c910efbbffefb17403ae9281c2b84 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 11:22:04 +0100 Subject: [PATCH 392/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 7112da15..f664b81e 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -124,7 +124,7 @@ - + @@ -153,7 +153,7 @@ - + From eb78db67369575aa286c933ed17541e53f39446e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 11:30:53 +0100 Subject: [PATCH 393/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index f664b81e..c5b1bd58 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -49,13 +49,11 @@ - - - + - + @@ -152,8 +150,8 @@ - - + + From 5bc3e19bbc6c3c59b1941afe1ac1305f683d5bff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 11:53:16 +0100 Subject: [PATCH 394/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 41 +++++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c5b1bd58..614142b9 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + <%= subtitle %> @@ -150,13 +150,46 @@ - - + + <% y_coords = 2664490 %> <% x_coords = 2349630 %> + <% 8.times do |index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% end %> <% images.each_with_index do |image, index| %> From 93a2dbd628818958fe6b4766f3a7d69174fcd29d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 11:54:40 +0100 Subject: [PATCH 395/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 614142b9..cfd9c52b 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -37,7 +37,7 @@ - + <%= title %> From dd66bb11ed759fbb515d0ef8ce016cf4c49a8650 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 11:58:27 +0100 Subject: [PATCH 396/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 33 --------------------- 1 file changed, 33 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index cfd9c52b..c6846b33 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -157,39 +157,6 @@ <% y_coords = 2664490 %> <% x_coords = 2349630 %> - <% 8.times do |index| %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% end %> <% images.each_with_index do |image, index| %> From ce8d448b60f0217e34715a97e8c1e5ad9121b421 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:03:27 +0100 Subject: [PATCH 397/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c6846b33..6a17865a 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -157,6 +157,32 @@ <% y_coords = 2664490 %> <% x_coords = 2349630 %> + <% 8.times do |index| %> + + + + + + + + + + + + + + + + + + + + + + + + + <% end %> <% images.each_with_index do |image, index| %> From 34f377605442c6494400b0bc9dbf90e7ce8d4b3f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:06:09 +0100 Subject: [PATCH 398/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6a17865a..77a33ee0 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -121,7 +121,7 @@ - + From 1bc50489d4fec93a1789891118b5919748da45e3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:13:34 +0100 Subject: [PATCH 399/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 77a33ee0..a88d7224 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -160,9 +160,16 @@ <% 8.times do |index| %> - + + + + + + - + + + @@ -186,7 +193,7 @@ <% images.each_with_index do |image, index| %> - + From 7312d112085cdfa0ef4e3e1b5a77cb9e85577929 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:16:47 +0100 Subject: [PATCH 400/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index a88d7224..af2db67d 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -188,7 +188,6 @@ - <% end %> <% images.each_with_index do |image, index| %> From 6a5d1465d64392d00229b009bf80a70fda75e6bd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:23:58 +0100 Subject: [PATCH 401/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index af2db67d..6f1d2a3c 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -157,7 +157,7 @@ <% y_coords = 2664490 %> <% x_coords = 2349630 %> - <% 8.times do |index| %> + <% 10.times do |index| %> @@ -175,7 +175,7 @@ - + @@ -242,7 +242,7 @@ <% if image[1].present? %> - + <%= image[2] %> @@ -251,7 +251,7 @@ <% if image[1].present? %> - + <%= image[1] %> From 8244feb34143ed548fe5837b91bcb24fe3d3630b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:39:44 +0100 Subject: [PATCH 402/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6f1d2a3c..74458725 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -156,7 +156,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2349630 %> + <% x_coords = 2716212 %> <% 10.times do |index| %> @@ -174,7 +174,7 @@ - + From 2071dad63069089b75d15b73359df83cf4ffd1fa Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:43:02 +0100 Subject: [PATCH 403/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 74458725..e1e90218 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -156,7 +156,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2716212 %> + <% x_coords = 2438400 %> <% 10.times do |index| %> From aaefec90b38945db2ee9d0201b89f19de2d79c34 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 12:46:56 +0100 Subject: [PATCH 404/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index e1e90218..e1dd4dae 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -156,7 +156,7 @@ <% y_coords = 2664490 %> - <% x_coords = 2438400 %> + <% x_coords = 2392098 %> <% 10.times do |index| %> @@ -174,7 +174,7 @@ - + From 7295f89b73432667769ed9df1cca1a3190f1755d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 13:43:53 +0100 Subject: [PATCH 405/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index e1dd4dae..df8cb66d 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -212,8 +212,8 @@ - - + + From ff5aa56fab5cd15658fd1b1644f1fa1917f0938e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 13:58:32 +0100 Subject: [PATCH 406/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index df8cb66d..eed200a6 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,7 +53,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -150,7 +150,7 @@ - + From d63bc9c35df1e886bfeae1b6878db110600d715a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 14:04:17 +0100 Subject: [PATCH 407/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index eed200a6..d8928926 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -53,8 +53,8 @@ - - + + From 9c16484c3ad437f058663d7cb48ac37371b73cee Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 15:04:09 +0100 Subject: [PATCH 408/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 32 --------------------- 1 file changed, 32 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index d8928926..f14013f0 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -157,38 +157,6 @@ <% y_coords = 2664490 %> <% x_coords = 2392098 %> - <% 10.times do |index| %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% end %> <% images.each_with_index do |image, index| %> From 418fba0a378fecb1ba0f01556a8edb5ed7c705f3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 16:07:48 +0100 Subject: [PATCH 409/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index f14013f0..01e6b2a3 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -81,8 +81,8 @@ - - + + @@ -150,7 +150,7 @@ - + From 3c3b141c8f37992d6ffcd17033375ff8c92a2d44 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 16:19:57 +0100 Subject: [PATCH 410/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 48 +++++++++++++++++++++------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 1efd9f05..18558d10 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -17,7 +17,7 @@ - + @@ -37,7 +37,7 @@ - + <%= title %> @@ -45,7 +45,33 @@ - + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + @@ -55,8 +81,8 @@ - - + + @@ -66,14 +92,14 @@ - <%= subtitle %> + <%= page_number %> - + @@ -95,14 +121,14 @@ - + - + @@ -124,8 +150,8 @@ - - + + From ca1ed670d7a9f161723be821f7c6f59d48a204a1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 16:24:54 +0100 Subject: [PATCH 411/561] style multi images --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/concept.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 51469988..96ece941 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,8 +52,8 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end - def add_concept_slide(title, subtitle = nil, logo, task_icon, image_information ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, logo: logo, task_icon: task_icon, image_information: image_information, images: images) + def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images) end def add_image_slide(title, subtitle = nil,images) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 7ffc1214..397d813c 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,10 +8,10 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:logo, :task_icon, :image_information, :images + attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images def initialize(options={}) - require_arguments [:title, :subtitle,:logo, :task_icon, :image_information, :images], options + require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images slide_y = 5535412 From 7634d515b6b2ed5146692ddbb635b4eb1d4604ff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 16:36:40 +0100 Subject: [PATCH 412/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 18558d10..d51e389b 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -158,7 +158,7 @@ <% images.each_with_index do |image, index| %> - + From 2011aa6bbeb15a6b9d867a8bde5745890ad555fb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 16:50:33 +0100 Subject: [PATCH 413/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index d51e389b..46b1b2f2 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -158,7 +158,7 @@ <% images.each_with_index do |image, index| %> - + From ec4eabe48ad905a8bdb4a9afe7fdc1aa3ae7eebb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 17:01:43 +0100 Subject: [PATCH 414/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 46b1b2f2..f00287d8 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -171,7 +171,7 @@ - + From 48cd9c2e957582abe4dd2c674497da1cb4bdff94 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 17:16:38 +0100 Subject: [PATCH 415/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 4 +--- lib/powerpoint/views/multiple_image.xml.erb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index f00287d8..fe4db185 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -75,9 +75,7 @@ - - - + diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 01e6b2a3..f64cc6d3 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -75,9 +75,7 @@ - - - + >>>>>>>>>>>>>>>>>> From 789401f23fa0f701789462fee692bb2ba8d5326a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 17:29:14 +0100 Subject: [PATCH 416/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index f64cc6d3..83badc13 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -75,7 +75,7 @@ - >>>>>>>>>>>>>>>>>> + @@ -89,7 +89,7 @@ - + <%= page_number %> From 4678e30b5cbda43cf2aafa206e201767ceefa4e4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 12 Feb 2021 17:44:31 +0100 Subject: [PATCH 417/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index fe4db185..3bd0280e 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -89,7 +89,7 @@ - + <%= page_number %> From 0fb721187298894c0b769f6c41a8d81dd6e21cdb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 10:50:23 +0100 Subject: [PATCH 418/561] style multi images --- lib/powerpoint/slide/dashboard.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 7da1d08e..2b6fbd7b 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -14,19 +14,19 @@ def initialize(options={}) require_arguments [:title, :subtitle, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data - @image_name = File.basename(@image_path) - @image_name_2 = File.basename(@image_path_2) - @image_name_3 = File.basename(@image_path_3) - @image_name_4 = File.basename(@image_path_4) - @logo = File.basename(@logo) + @image_name = File.basename(image_path) + @image_name_2 = File.basename(image_path_2) + @image_name_3 = File.basename(image_path_3) + @image_name_4 = File.basename(image_path_4) + @logo = File.basename(logo) end def save(extract_path, index) - copy_media(extract_path, @image_path) - copy_media(extract_path, @image_path_2) - copy_media(extract_path, @image_path_3) - copy_media(extract_path, @image_path_4) - copy_media(extract_path, @logo) + copy_media(extract_path, image_path) + copy_media(extract_path, image_path_2) + copy_media(extract_path, image_path_3) + copy_media(extract_path, image_path_4) + copy_media(extract_path, logo) save_rel_xml(extract_path, index) save_slide_xml(extract_path, index) end From 6b01ffd8eafafc599b2014860bf9df694b538c80 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 11:00:02 +0100 Subject: [PATCH 419/561] style multi images --- lib/powerpoint/slide/dashboard.rb | 6 ++++++ lib/powerpoint/slide/dashboard_user.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index 2b6fbd7b..ea0cffcc 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -22,6 +22,12 @@ def initialize(options={}) end def save(extract_path, index) + puts image_path + puts image_path_2 + puts image_path_3 + puts image_path_4 + puts logo + puts '------------------->' copy_media(extract_path, image_path) copy_media(extract_path, image_path_2) copy_media(extract_path, image_path_3) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index 548ff635..f0152b17 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -14,7 +14,7 @@ def initialize(options={}) require_arguments [:title, :subtitle,:logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - @logo = File.basename(@logo) + @logo = File.basename(logo) end def save(extract_path, index) From 94b3666ba36d7673628dac391efcd0bbd1a3568b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 11:27:09 +0100 Subject: [PATCH 420/561] style multi images --- lib/powerpoint/slide/dashboard.rb | 2 +- lib/powerpoint/slide/dashboard_user.rb | 2 +- lib/powerpoint/views/dashboard_rel.xml.erb | 2 +- lib/powerpoint/views/dashboard_user_rel.xml.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index ea0cffcc..e716387f 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -18,7 +18,7 @@ def initialize(options={}) @image_name_2 = File.basename(image_path_2) @image_name_3 = File.basename(image_path_3) @image_name_4 = File.basename(image_path_4) - @logo = File.basename(logo) + @logo_name = File.basename(logo) end def save(extract_path, index) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index f0152b17..a7865a2e 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -14,7 +14,7 @@ def initialize(options={}) require_arguments [:title, :subtitle,:logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - @logo = File.basename(logo) + @logo_name = File.basename(logo) end def save(extract_path, index) diff --git a/lib/powerpoint/views/dashboard_rel.xml.erb b/lib/powerpoint/views/dashboard_rel.xml.erb index d5ce6abb..777b168c 100644 --- a/lib/powerpoint/views/dashboard_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_rel.xml.erb @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/lib/powerpoint/views/dashboard_user_rel.xml.erb b/lib/powerpoint/views/dashboard_user_rel.xml.erb index d1fa3c1b..d6c9b2b4 100644 --- a/lib/powerpoint/views/dashboard_user_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_user_rel.xml.erb @@ -1,7 +1,7 @@ - + <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> From 4f06e95c3fc61f0fd94d7e0dfef662ba0af01624 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 12:08:53 +0100 Subject: [PATCH 421/561] style multi images --- .../views/extended_intro_slide.xml.erb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index d731295a..eb97fdf7 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -49,7 +49,7 @@ - + <%= title %> @@ -84,7 +84,7 @@ - + <%= subtitle %> @@ -116,7 +116,11 @@ - + + + + + <%= subtitle_2 %> @@ -145,7 +149,11 @@ - + + + + + <%= Date.today %> From 68e06bf1302d47c004f59a0f842aa15dbf7390d9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 12:49:34 +0100 Subject: [PATCH 422/561] style multi images --- lib/powerpoint/views/extended_intro_slide.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/extended_intro_slide.xml.erb b/lib/powerpoint/views/extended_intro_slide.xml.erb index eb97fdf7..28ab9e07 100644 --- a/lib/powerpoint/views/extended_intro_slide.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide.xml.erb @@ -93,7 +93,7 @@ <% end %> - <% if subtitle.present? %> + <% if subtitle_2.present? %> From f6fa4201a883efca9cccf4898c845563846bdf64 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:05:41 +0100 Subject: [PATCH 423/561] style multi images --- lib/powerpoint/views/dashboard.xml.erb | 20 ++++++------- lib/powerpoint/views/multiple_image.xml.erb | 32 +++++++++++++++++---- template/ppt/theme/theme2.xml | 2 +- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 7c97caa5..211b23cd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -630,7 +630,7 @@ - + Total posts in market @@ -670,7 +670,7 @@ - + Time spent in market @@ -710,7 +710,7 @@ - + Image posts @@ -750,7 +750,7 @@ - + Video posts @@ -790,7 +790,7 @@ - + Text posts @@ -830,7 +830,7 @@ - + <%= @data[:total_posts] %> @@ -870,7 +870,7 @@ - + <%= @data[:log_time] %> @@ -910,7 +910,7 @@ - + <%= @data[:post_types][:image] %> @@ -950,7 +950,7 @@ - + <%= @data[:post_types][:video] %> @@ -990,7 +990,7 @@ - + <%= @data[:post_types][:text] %> diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 83badc13..01645ebf 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -27,7 +27,7 @@ - + @@ -37,7 +37,11 @@ - + + + + + <%= title %> @@ -63,7 +67,11 @@ - + + + + <%= subtitle %> @@ -89,7 +97,11 @@ - + + + + + <%= page_number %> @@ -208,7 +220,11 @@ <% if image[1].present? %> - + + + + + <%= image[2] %> @@ -217,7 +233,11 @@ <% if image[1].present? %> - + + + + + <%= image[1] %> diff --git a/template/ppt/theme/theme2.xml b/template/ppt/theme/theme2.xml index 2a081e6e..dca41ace 100644 --- a/template/ppt/theme/theme2.xml +++ b/template/ppt/theme/theme2.xml @@ -9,7 +9,7 @@ - + From 23a7e4c8fdf7ec5cdefb2988b772bb9d67ac28ac Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:09:07 +0100 Subject: [PATCH 424/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 32 ++++----------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 01645ebf..c2109cd4 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -27,7 +27,7 @@ - + @@ -37,11 +37,7 @@ - - - - - + <%= title %> @@ -67,11 +63,7 @@ - - - - + <%= subtitle %> @@ -97,11 +89,7 @@ - - - - - + <%= page_number %> @@ -220,11 +208,7 @@ <% if image[1].present? %> - - - - - + <%= image[2] %> @@ -233,11 +217,7 @@ <% if image[1].present? %> - - - - - + <%= image[1] %> From c644c12a0c100524265a6c377b514ecee7a55c6f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:12:50 +0100 Subject: [PATCH 425/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c2109cd4..349d3f3e 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -38,6 +38,10 @@ + + - - - <%= title %> From 539f6f2349c32dcd0966743dabb5a919a60d3aba Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:17:38 +0100 Subject: [PATCH 427/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c477c5b5..dac759ea 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -37,7 +37,7 @@ - + From 7111279f9daa4974839c7980a81db120dbe5ecdb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:56:52 +0100 Subject: [PATCH 428/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index dac759ea..44533a98 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -67,7 +67,11 @@ - + + + + + <%= subtitle %> @@ -93,7 +97,11 @@ - + + + + + <%= page_number %> @@ -212,7 +220,11 @@ <% if image[1].present? %> - + + + + + <%= image[2] %> From 6b6988d96304391a65e4b49835e8b65b91af68fd Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 13:59:44 +0100 Subject: [PATCH 429/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 44533a98..fffc6162 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -233,7 +233,11 @@ <% if image[1].present? %> - + + + + + <%= image[1] %> From 194b4e4ce9aad4e0f6fc037399830ab62ea71792 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 14:05:32 +0100 Subject: [PATCH 430/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index fffc6162..dc6b0eaa 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -220,7 +220,7 @@ <% if image[1].present? %> - + @@ -233,7 +233,7 @@ <% if image[1].present? %> - + From d9cd7e0ef9876d5ae76e23b31825a82e4ed46820 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 14:12:47 +0100 Subject: [PATCH 431/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index dc6b0eaa..706d6146 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -27,7 +27,7 @@ - + From 2689bcfd7070b50ea6d9411ca6d4224cea94ce01 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 14:17:47 +0100 Subject: [PATCH 432/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 706d6146..6244ac88 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -206,7 +206,7 @@ - + From 6ab1aa96c9e124adae9fa1f77755d5717f9ee6be Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 14:56:44 +0100 Subject: [PATCH 433/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6244ac88..c401b023 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -18,9 +18,6 @@ - - - From 26f59fdd553c6e6964e25a652c90fd042aa83e1d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 15:19:09 +0100 Subject: [PATCH 434/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index c401b023..6244ac88 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -18,6 +18,9 @@ + + + From a10abdc0c696382d091e784035be4b9f6213d042 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 15:41:15 +0100 Subject: [PATCH 435/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6244ac88..af01250a 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -21,9 +21,7 @@ - - - + From cb16d1b707085841b1902529f4747ffdc8aa36ed Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 16:22:25 +0100 Subject: [PATCH 436/561] style multi images --- lib/powerpoint/views/multiple_image.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index af01250a..7f7aba53 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -39,6 +39,7 @@ + <%= title %> From bad8edfc8bab92bb6df8f6ec9f34324547dbee16 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 16:38:37 +0100 Subject: [PATCH 437/561] style multi images --- lib/powerpoint/views/concept.xml.erb | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 3bd0280e..767bc66e 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -21,13 +21,11 @@ - - - + - + @@ -37,7 +35,12 @@ - + + + + + + <%= title %> @@ -63,7 +66,11 @@ - + + + + + <%= subtitle %> @@ -89,7 +96,11 @@ - + + + + + <%= page_number %> From b2d3d40158235ab413fe6542cc4bdef96cb479c9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 16:50:46 +0100 Subject: [PATCH 438/561] style multi images --- lib/powerpoint/slide/dashboard.rb | 6 -- lib/powerpoint/views/dashboard.xml.erb | 94 ++++++++++++++------------ 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index e716387f..f5ac7b8f 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -22,12 +22,6 @@ def initialize(options={}) end def save(extract_path, index) - puts image_path - puts image_path_2 - puts image_path_3 - puts image_path_4 - puts logo - puts '------------------->' copy_media(extract_path, image_path) copy_media(extract_path, image_path_2) copy_media(extract_path, image_path_3) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 211b23cd..470a88dd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -1,7 +1,7 @@ - + @@ -17,17 +17,15 @@ - + - - - + - + @@ -37,7 +35,12 @@ - + + + + + + <%= title %> @@ -45,33 +48,63 @@ - + - - - + - - + + - + - + + + + + <%= subtitle %> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,35 +254,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 62867761306426f3d64e45ab9d42f0481017cbe7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 17:11:29 +0100 Subject: [PATCH 439/561] style multi images --- lib/powerpoint/presentation.rb | 8 +-- lib/powerpoint/slide/dashboard.rb | 4 +- lib/powerpoint/slide/dashboard_user.rb | 4 +- lib/powerpoint/views/dashboard.xml.erb | 80 ++++++++++++++++++-------- 4 files changed, 63 insertions(+), 33 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 96ece941..9c197bf6 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -60,12 +60,12 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, logo, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) + def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, logo, data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) end - def add_dashboard_user_slide(title, subtitle = nil, logo, images) - @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle, logo: logo, images: images) + def add_dashboard_user_slide(title, subtitle = nil, pge_number, logo, images) + @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle,page_number: page_number, logo: logo, images: images) end def save(path) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index f5ac7b8f..fcf1a247 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,10 +8,10 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :logo, :data + attr_reader :title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :logo, :data def initialize(options={}) - require_arguments [:title, :subtitle, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options + require_arguments [:title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(image_path) diff --git a/lib/powerpoint/slide/dashboard_user.rb b/lib/powerpoint/slide/dashboard_user.rb index a7865a2e..e483196c 100644 --- a/lib/powerpoint/slide/dashboard_user.rb +++ b/lib/powerpoint/slide/dashboard_user.rb @@ -8,10 +8,10 @@ module Slide class DashboardUser include Powerpoint::Util - attr_reader :title, :subtitle,:logo, :images + attr_reader :title, :subtitle,:page_number,:logo, :images def initialize(options={}) - require_arguments [:title, :subtitle,:logo, :images], options + require_arguments [:title, :subtitle,:page_number,:logo, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images @logo_name = File.basename(logo) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 470a88dd..395e1ef5 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -76,35 +76,36 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - + + + + + + + + + + + + <%= page_number %> + + + + @@ -254,6 +255,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 353851cc8056297dd4d1f8a828955b034d00fa0c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 15 Feb 2021 17:47:56 +0100 Subject: [PATCH 440/561] style multi images --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 9c197bf6..2f9ee677 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -64,7 +64,7 @@ def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) end - def add_dashboard_user_slide(title, subtitle = nil, pge_number, logo, images) + def add_dashboard_user_slide(title, subtitle = nil, page_number, logo, images) @slides << Powerpoint::Slide::DashboardUser.new(presentation: self, title: title, subtitle: subtitle,page_number: page_number, logo: logo, images: images) end From 6fdafaef8c0a6b51b926f1e8a8b9c5aaa0f9fe35 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 11:06:15 +0100 Subject: [PATCH 441/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 76 ++++++++------------------ 1 file changed, 23 insertions(+), 53 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 395e1ef5..2bf5cd8e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -1,7 +1,7 @@ - + @@ -106,65 +106,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - + + + + + - - + + - - - - - - - - - - + From 36993cb95b1077c8f86583bd44d0c054465cee2b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 11:20:40 +0100 Subject: [PATCH 442/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 31 +------------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 2bf5cd8e..3b3e62a3 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -117,7 +117,7 @@ - + @@ -225,35 +225,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 94ee93795f60a03fc54b80210fbd733b8d300a16 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 11:42:03 +0100 Subject: [PATCH 443/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 2 +- lib/powerpoint/views/dashboard_user.xml.erb | 71 +++++++++++++++------ 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 3b3e62a3..730f98e7 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -25,7 +25,7 @@ - + diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 993bf56e..15fd6235 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -17,17 +17,15 @@ - + - - - + - + @@ -37,7 +35,12 @@ - + + + + + + <%= title %> @@ -45,35 +48,67 @@ - + - - - + - - + + - + - + + + + + <%= subtitle %> - + + + + + + + + + + + + + + + + + + + + + + + + + + <%= page_number %> + + + + + - + @@ -95,8 +130,8 @@ - - + + From c7327b60714caab2b6972e40ffbc76d801ce6d9e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 12:02:21 +0100 Subject: [PATCH 444/561] dashboard --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/dashboard.rb | 4 ++-- lib/powerpoint/views/dashboard.xml.erb | 32 +------------------------- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 2f9ee677..6d918194 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -60,8 +60,8 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph_1_subtitle, graph_2_title, graph_2_subtitle, image_1, image_2, image_3, image_4, logo, data) - @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, graph_2_subtitle: graph_2_subtitle, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) + def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph_1_subtitle, graph_2_title image_1, image_2, image_3, image_4, logo, data) + @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) end def add_dashboard_user_slide(title, subtitle = nil, page_number, logo, images) diff --git a/lib/powerpoint/slide/dashboard.rb b/lib/powerpoint/slide/dashboard.rb index fcf1a247..beef65bb 100644 --- a/lib/powerpoint/slide/dashboard.rb +++ b/lib/powerpoint/slide/dashboard.rb @@ -8,10 +8,10 @@ module Slide class Dashboard include Powerpoint::Util - attr_reader :title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :logo, :data + attr_reader :title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :image_path, :image_path_2,:image_path_3,:image_path_4, :image_name, :logo, :data def initialize(options={}) - require_arguments [:title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :graph_2_subtitle, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options + require_arguments [:title, :subtitle,:page_number, :graph_1_title, :graph_1_subtitle, :graph_2_title, :image_path, :image_path_2,:image_path_3, :image_path_4, :logo, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @data = data @image_name = File.basename(image_path) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 730f98e7..d5713792 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -296,7 +296,7 @@ - + @@ -542,36 +542,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_2_subtitle %> - - - From d8fe009ffe241f4eaedc9e27a6c4337cf100062d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 12:05:29 +0100 Subject: [PATCH 445/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index d5713792..6aee0636 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -269,6 +269,12 @@ + + + + + + @@ -525,7 +531,7 @@ - + From 4e672297456b9e22d4eaa4e34793c18581470919 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 12:18:43 +0100 Subject: [PATCH 446/561] dashboard --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 6d918194..94efd422 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -60,7 +60,7 @@ def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end - def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph_1_subtitle, graph_2_title image_1, image_2, image_3, image_4, logo, data) + def add_dashboard_slide(title, subtitle = nil, page_number, graph_1_title, graph_1_subtitle, graph_2_title, image_1, image_2, image_3, image_4, logo, data) @slides << Powerpoint::Slide::Dashboard.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, graph_1_title: graph_1_title, graph_1_subtitle: graph_1_subtitle, graph_2_title: graph_2_title, image_path: image_1, image_path_2: image_2, image_path_3: image_3, image_path_4: image_4, logo: logo, data: data) end From b106874edad65f600a0a4140b5626868a3c92023 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 12:57:58 +0100 Subject: [PATCH 447/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6aee0636..89654924 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -151,8 +151,8 @@ - - + + @@ -284,7 +284,7 @@ - + <%= graph_1_title %> @@ -303,7 +303,7 @@ - + @@ -526,7 +526,7 @@ - + From 39ea9f282f1b0867d84668c99dab1df70624ebb0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 13:30:39 +0100 Subject: [PATCH 448/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 89654924..5b4e2ce4 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -152,7 +152,7 @@ - + @@ -266,8 +266,8 @@ - - + + From 1b2244819e4c8898e253533a58b9441b10a9661b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 13:42:51 +0100 Subject: [PATCH 449/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 36 +++----------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 5b4e2ce4..091ee12c 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,8 +181,8 @@ - - + + @@ -195,36 +195,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -267,7 +237,7 @@ - + From b69b67846d575df73ec407f5e5b3f75ee3dcf6ef Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 13:56:39 +0100 Subject: [PATCH 450/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 091ee12c..e0bc8e9e 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -252,7 +252,11 @@ - + + + + + <%= graph_1_title %> From f7df2a4501f4ed3b0a3fc3c1ffb316bf79be391b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 14:13:45 +0100 Subject: [PATCH 451/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index e0bc8e9e..5a60773b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -252,10 +252,11 @@ + - - - + + + From a35154160f4e8e4c39888463fa320137b4af5d5f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 14:14:33 +0100 Subject: [PATCH 452/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 5a60773b..6ed85364 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -237,7 +237,7 @@ - + From 85681f08da3a7846b76206bf8fd7560280fb7a3c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 14:43:38 +0100 Subject: [PATCH 453/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 6ed85364..db15631b 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,18 +181,18 @@ - - + + - - - - - - + + + + + + From dc051acbba8e5404c3b69c7ac5107d70253b5374 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 14:57:02 +0100 Subject: [PATCH 454/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index db15631b..5cbb45d7 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -181,8 +181,8 @@ - - + + From 34642fda78fdf00ce8740cfa99d3c4c4e0f11a4d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:02:33 +0100 Subject: [PATCH 455/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 5cbb45d7..043afe53 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -231,7 +231,7 @@ - + @@ -257,6 +257,7 @@ + From 2286755bd4e8fe600db868aaf5cd0d24ff6b02b2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:23:47 +0100 Subject: [PATCH 456/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 043afe53..14816aa3 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -231,7 +231,7 @@ - + @@ -257,10 +257,8 @@ - - <%= graph_1_title %> From 82cafb4edd791ebbddf154b0cd9592702f7a6c0f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:27:25 +0100 Subject: [PATCH 457/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 14816aa3..e1a6309f 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -288,7 +288,7 @@ - + <%= graph_1_subtitle %> From 8e7bec5901ef5e7b5f809e5cc5d21ca7c59b0547 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:42:08 +0100 Subject: [PATCH 458/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index e1a6309f..17ea6b30 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -226,12 +226,12 @@ - + - + @@ -239,12 +239,6 @@ - - - - - - @@ -253,12 +247,8 @@ - - - - - + <%= graph_1_title %> From 7b92f92e05da4e4d34dec4ac850bd8068310bb0e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:51:10 +0100 Subject: [PATCH 459/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 56 +++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 17ea6b30..13a523b3 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -157,12 +157,12 @@ - - - - - - + + + + + + @@ -254,6 +254,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + + + + From f47929eef1ef7d61cf5c5c2bec7b805615128de7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 15:57:00 +0100 Subject: [PATCH 460/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 121 ++++++++----------------- 1 file changed, 40 insertions(+), 81 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 13a523b3..2b69e4cd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -217,87 +217,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_1_title %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_1_title %> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + From acd1390abd5a6fea5113a313293dc5effc975f25 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:01:24 +0100 Subject: [PATCH 461/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 77 +++++++++++++------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 2b69e4cd..66b76f39 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -217,46 +217,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%= graph_1_title %> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_1_title %> + + + + From 7900d66085371f3d82ac1b5c5587b9222de9613d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:12:54 +0100 Subject: [PATCH 462/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 66b76f39..17ea6b30 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -157,12 +157,12 @@ - - - - - - + + + + + + From d3045026e9590b225e2a32a716f59978c21637a8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:13:40 +0100 Subject: [PATCH 463/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 17ea6b30..37849dda 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -226,12 +226,12 @@ - + - + @@ -239,6 +239,12 @@ + + + + + + @@ -247,8 +253,12 @@ + + + + + - <%= graph_1_title %> @@ -278,7 +288,7 @@ - + <%= graph_1_subtitle %> From 6bfedcf437fe93c3056a19a846232b3ec2442b76 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:22:24 +0100 Subject: [PATCH 464/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 44 ++++---------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 37849dda..0af92c13 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -226,12 +226,12 @@ - + - + @@ -253,42 +253,12 @@ - - - - - - <%= graph_1_title %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + <%= graph_1_subtitle %> From b051f5d54685ff0a78c15aeaaa64ea54362f02c4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:26:37 +0100 Subject: [PATCH 465/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 44 ++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 0af92c13..9a2f42d0 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -226,12 +226,12 @@ - + - + @@ -246,6 +246,46 @@ + + + + + + + + + + + + + + <%= graph_1_title %> + + + + + + + + + + + + + + + + + + + + + + + + + + From a0823e1c313f3ba7e53ca8a2897d4f0269e8012d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:29:44 +0100 Subject: [PATCH 466/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 32 +++++++++----------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 9a2f42d0..aa935b71 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -226,12 +226,12 @@ - + - + @@ -253,12 +253,12 @@ - - - - - + + + + + <%= graph_1_title %> @@ -266,7 +266,7 @@ - + @@ -276,15 +276,9 @@ - - + + - - - - - - @@ -294,11 +288,7 @@ - - - - - + <%= graph_1_subtitle %> From c5cca2934fc2adfcbc13a2375686c4b569543dc6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:35:19 +0100 Subject: [PATCH 467/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index aa935b71..aab4f2dd 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -151,18 +151,18 @@ - - + + - - - - - - + + + + + + @@ -505,7 +505,7 @@ - + From d42d8ffd58a362e2bfe5006e335262203ad94471 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:42:42 +0100 Subject: [PATCH 468/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index aab4f2dd..14062657 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -276,7 +276,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -468,7 +468,7 @@ - + From 495409dac34993554a0bbb39f502e6aa3fd131f1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 16:57:02 +0100 Subject: [PATCH 469/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 14062657..1a0b8937 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -219,8 +219,8 @@ - - + + @@ -335,7 +335,7 @@ - + @@ -347,7 +347,7 @@ - + Male @@ -413,14 +413,14 @@ - + Female - + <%= @data[:genders]['f'] %> @@ -480,7 +480,7 @@ - + Other From 9474b385f5a07b6a9126c497f1c259ecf5ce1ce9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 16 Feb 2021 17:38:54 +0100 Subject: [PATCH 470/561] dashboard --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 1a0b8937..0d5e3f75 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -220,7 +220,7 @@ - + From 3f950ba9ea6e216a06989e695e19eeb92681dade Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 18 Feb 2021 16:52:15 +0100 Subject: [PATCH 471/561] concept height --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 767bc66e..ebda0966 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -159,7 +159,7 @@ - + From e48cc38a95700c4b1deed9205a87c6326dea85ba Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 18 Feb 2021 17:27:56 +0100 Subject: [PATCH 472/561] concept height --- lib/powerpoint/slide/concept.rb | 2 +- lib/powerpoint/views/concept.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 397d813c..ce1a165c 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -17,7 +17,7 @@ def initialize(options={}) slide_y = 5535412 slide_x = 11070824 slide_x_offset = 560588 - slide_y_offset = 1283763 + slide_y_offset = 1183763 #image information = [width, height, ratio] # if image is taller than it is wider if (image_information[2] < 2) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index ebda0966..767bc66e 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -159,7 +159,7 @@ - + From d1a771cf2fa8d99d69142702a509442dce093265 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 18 Feb 2021 17:43:40 +0100 Subject: [PATCH 473/561] concept height --- lib/powerpoint/slide/concept.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index ce1a165c..25e84bbb 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -17,7 +17,7 @@ def initialize(options={}) slide_y = 5535412 slide_x = 11070824 slide_x_offset = 560588 - slide_y_offset = 1183763 + slide_y_offset = 1083763 #image information = [width, height, ratio] # if image is taller than it is wider if (image_information[2] < 2) From 4160b7a090ba78cb6f577ddaefeeabe0d18abe9d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 18 Feb 2021 18:16:59 +0100 Subject: [PATCH 474/561] concept height --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 7f7aba53..48810046 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -190,7 +190,7 @@ - + From 3fee68b6862d5550d033be91bf9edb400a1503c6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 09:59:06 +0100 Subject: [PATCH 475/561] image dimensions --- lib/powerpoint/slide/concept.rb | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 25e84bbb..7df20909 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -14,23 +14,10 @@ def initialize(options={}) require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images - slide_y = 5535412 - slide_x = 11070824 - slide_x_offset = 560588 - slide_y_offset = 1083763 - #image information = [width, height, ratio] - # if image is taller than it is wider - if (image_information[2] < 2) - @image_y_scale = slide_y - @image_x_scale = (slide_y * image_information[2]).round - @image_x_offset = (slide_x_offset + ((slide_x - @image_x_scale) / 2)).round - @image_y_offset = slide_y_offset - else - @image_y_scale = (slide_x / image_information[2]).round - @image_x_scale = slide_x - @image_x_offset = slide_x_offset - @image_y_offset = (slide_y_offset + ((slide_y - @image_y_scale)/2)).round - end + @image_y_scale = image_information[1] + @image_x_scale = image_information[0] + @image_x_offset = image_information[2] + @image_y_offset = image_information[3] end def save(extract_path, index) From 8ac67e7ef8ed3dfdd2c850149cbff9deed0f9abc Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 11:34:28 +0100 Subject: [PATCH 476/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 48810046..d34abdc3 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,8 +189,8 @@ - - + + @@ -216,7 +216,7 @@ - <% if image[1].present? %> + <% if image[2].present? %> From 40636a7349f51695f3a88fcfa6e089054e835f4d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 11:39:49 +0100 Subject: [PATCH 477/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index d34abdc3..9bd788e7 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 3e57554068fcd3ee44fc1bc199d5b7d083f150af Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:00:55 +0100 Subject: [PATCH 478/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 9bd788e7..a920dd6c 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -190,7 +190,7 @@ - + From 6d02771c97138b2f6d7832ac2675548ff8b05bff Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:07:29 +0100 Subject: [PATCH 479/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index a920dd6c..878040aa 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From c674ac04effe668d7a1b5c28f2b25646b8984ff0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:23:47 +0100 Subject: [PATCH 480/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 878040aa..66d36f21 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 0d423031f4af6d3427e240b4848e2dc8f55e43f6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:28:59 +0100 Subject: [PATCH 481/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 66d36f21..878040aa 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 438ad8c9ed67f62a87116528d96baf396156d936 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:42:15 +0100 Subject: [PATCH 482/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 878040aa..461cb7c3 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From a6eb85b4b1a24821dcdbc1eca0c59c2219baa388 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 12:59:37 +0100 Subject: [PATCH 483/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 461cb7c3..148acdb9 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 5f74519cd4d46a7c56b4c3f405579295534c2490 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 13:12:01 +0100 Subject: [PATCH 484/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 148acdb9..26e8039e 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 070322990e70c08dc3e39fae505bb4b512e3df24 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 13:18:10 +0100 Subject: [PATCH 485/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 26e8039e..2478549a 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 35de390eaf70948c672e210cb16e846b11e7868f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 13:22:52 +0100 Subject: [PATCH 486/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 2478549a..e69ba6a0 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From b41a3bad0ab9200fa20e70c8f0d96164c91802e0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 13:27:32 +0100 Subject: [PATCH 487/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index e69ba6a0..fc6846e6 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 04ef0c4de1edb3f3485ac47d8f51adc5ed8c4457 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 13:58:50 +0100 Subject: [PATCH 488/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index fc6846e6..4acf058d 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 562b688788993f2e535d29ec7178417b993f175c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 14:11:10 +0100 Subject: [PATCH 489/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 4acf058d..fc6846e6 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From f76926009e70835c321d0b8dc2f365955616ddfb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 14:54:17 +0100 Subject: [PATCH 490/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index fc6846e6..dcd02e75 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 0a1e666b00ae232a8710aff104744b7e361ce1f7 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 14:59:05 +0100 Subject: [PATCH 491/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index dcd02e75..70db7f5a 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 1ba463dc36f46564c5cc571515370c79bcaad143 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 15:05:40 +0100 Subject: [PATCH 492/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 70db7f5a..e556c26b 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From b899b84bedaceca849245aca46b7cb1fce487d39 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 15:18:02 +0100 Subject: [PATCH 493/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index e556c26b..0fb5d608 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 500f5bc7eacff4a459582e8d50587d568bd91674 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 15:22:32 +0100 Subject: [PATCH 494/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 0fb5d608..de039109 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 8477e03c4acce09fe136965f0b85671f01c01880 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 15:38:24 +0100 Subject: [PATCH 495/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index de039109..b05cc4d6 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From be513b58b8c7082cef0932463282543b9a6f1ddb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 15:41:14 +0100 Subject: [PATCH 496/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index b05cc4d6..1c995ba6 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -189,7 +189,7 @@ - + From 61a1f83cae4397f9e5102d86d3eba10bd105dc5b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:16:06 +0100 Subject: [PATCH 497/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 1c995ba6..e0cf5561 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -167,6 +167,36 @@ <% y_coords = 2664490 %> <% x_coords = 2392098 %> <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a7118cae6a31d6501b62536d1e402c9248c2c569 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:22:28 +0100 Subject: [PATCH 498/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index e0cf5561..d19bceec 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -183,7 +183,7 @@ - + From f33ea3fb3f9257a9861018499f2507bf0a6ced36 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:27:32 +0100 Subject: [PATCH 499/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index d19bceec..b5bb62bc 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 67e03752318c1516291f57948efa8113cddcf29d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:30:24 +0100 Subject: [PATCH 500/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index b5bb62bc..2e15bfe4 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 307114ca6670a69b60314f10954055dad878e250 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:33:46 +0100 Subject: [PATCH 501/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 2e15bfe4..d19bceec 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 47880bcd287d5df3b36f62e3b278cb7ca98591a3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:36:01 +0100 Subject: [PATCH 502/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index d19bceec..b5bb62bc 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From d0822a71ac7ee2e7f9a91708d815a041ac8c5e72 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:45:20 +0100 Subject: [PATCH 503/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index b5bb62bc..3238b256 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 6e3a72dbd0f92cba6b4fd1bf93130d03943d7315 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:51:45 +0100 Subject: [PATCH 504/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 3238b256..4836c3bf 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 8bd636e7e1ae0a83b062afa66e972ede7e7f8f9f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 17:54:26 +0100 Subject: [PATCH 505/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 4836c3bf..fe6a583f 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 19578401a84ab1b1759872c5d6345f863680fc78 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 18:09:42 +0100 Subject: [PATCH 506/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index fe6a583f..6bff5e3b 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 3095a134346ee1008bd40a0ea36eaf24a7b65e03 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 18:14:11 +0100 Subject: [PATCH 507/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6bff5e3b..fac888d4 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From b9ef3a246276cae5bd19bfafcaee4dc738a2c6d8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 19 Feb 2021 18:18:38 +0100 Subject: [PATCH 508/561] image dimensions --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index fac888d4..4f455d74 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -219,7 +219,7 @@ - + From 13bcf3db9932213dc09a26cf0c4464347c6dd690 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 22 Feb 2021 14:52:20 +0100 Subject: [PATCH 509/561] dashboard.xml seconds --- lib/powerpoint/views/dashboard.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 0d5e3f75..59581007 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -793,7 +793,7 @@ - + From da5a4c1dd8f763506fbeb87d8675c74b7c2b0ffe Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 23 Feb 2021 17:59:09 +0100 Subject: [PATCH 510/561] update box colour --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- template/ppt/theme/theme2.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 4f455d74..902f6d22 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -192,7 +192,7 @@ - + diff --git a/template/ppt/theme/theme2.xml b/template/ppt/theme/theme2.xml index dca41ace..8bc29fb0 100644 --- a/template/ppt/theme/theme2.xml +++ b/template/ppt/theme/theme2.xml @@ -12,7 +12,7 @@ - + From 7c8897c66431797052e88f1f88405c3b9d3b7c7a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 25 Feb 2021 15:13:15 +0100 Subject: [PATCH 511/561] woek sans semi bold --- lib/powerpoint/views/multiple_image.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 902f6d22..6f4dd073 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -253,6 +253,7 @@ + <%= image[2] %> From b5a859079f677a5d75606a440dc748c97b88ced9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 25 Feb 2021 15:15:47 +0100 Subject: [PATCH 512/561] woek sans semi bold --- lib/powerpoint/views/multiple_image.xml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 6f4dd073..7dbcd820 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -253,7 +253,7 @@ - + <%= image[2] %> @@ -267,6 +267,7 @@ + <%= image[1] %> From c11afe517cca0767bde2bddce3cf60e001c79edf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 25 Feb 2021 15:38:11 +0100 Subject: [PATCH 513/561] woek sans semi bold --- lib/powerpoint/views/multiple_image.xml.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 7dbcd820..336496ba 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -70,6 +70,7 @@ + <%= subtitle %> @@ -100,6 +101,7 @@ + <%= page_number %> From 9446d16341a0473aada3ca908afeb2f7a605c06f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 25 Feb 2021 16:14:24 +0100 Subject: [PATCH 514/561] woek sans semi bold --- lib/powerpoint/views/dashboard_user.xml.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 15fd6235..ee09c200 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -196,7 +196,12 @@ - + + + + + + <%= image[0] %> From b1374962a32aa14874d2ddde33f179520a920d61 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 10:21:59 +0100 Subject: [PATCH 515/561] font size dashboard user --- lib/powerpoint/views/dashboard_user.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index ee09c200..74b6654d 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -196,8 +196,8 @@ - - + + From 2d3856b3ea5730fda20e884ff94283375c61fd9b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:10:55 +0100 Subject: [PATCH 516/561] collage filters --- lib/powerpoint.rb | 1 + lib/powerpoint/presentation.rb | 4 + lib/powerpoint/slide/collage.rb | 47 +++++ lib/powerpoint/views/collage.xml.erb | 211 +++++++++++++++++++++++ lib/powerpoint/views/collage_rel.xml.erb | 9 + 5 files changed, 272 insertions(+) create mode 100644 lib/powerpoint/slide/collage.rb create mode 100644 lib/powerpoint/views/collage.xml.erb create mode 100644 lib/powerpoint/views/collage_rel.xml.erb diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 8b2a1f96..778868f7 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -4,6 +4,7 @@ require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/multiple_image' require 'powerpoint/slide/concept' +require 'powerpoint/slide/collage' require 'powerpoint/slide/image' require 'powerpoint/slide/textual' require 'powerpoint/slide/pictorial' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 94efd422..21c0b010 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -56,6 +56,10 @@ def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images) end + def add_collage_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images) + @slides << Powerpoint::Slide::Collage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images) + end + def add_image_slide(title, subtitle = nil,images) @slides << Powerpoint::Slide::Image.new(presentation: self, title: title, subtitle: subtitle) end diff --git a/lib/powerpoint/slide/collage.rb b/lib/powerpoint/slide/collage.rb new file mode 100644 index 00000000..13dc8e44 --- /dev/null +++ b/lib/powerpoint/slide/collage.rb @@ -0,0 +1,47 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Collage + include Powerpoint::Util + + attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images + + def initialize(options={}) + require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @images = images + @image_y_scale = image_information[1] + @image_x_scale = image_information[0] + @image_x_offset = image_information[2] + @image_y_offset = image_information[3] + end + + def save(extract_path, index) + @images.each do |image| + copy_media(extract_path, image) + end + + copy_media(extract_path, logo) + copy_media(extract_path, task_icon) + + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + + def save_rel_xml(extract_path, index) + render_view('collage_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('collage.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/collage.xml.erb b/lib/powerpoint/views/collage.xml.erb new file mode 100644 index 00000000..d046ede4 --- /dev/null +++ b/lib/powerpoint/views/collage.xml.erb @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= page_number %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% end %> + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/collage_rel.xml.erb b/lib/powerpoint/views/collage_rel.xml.erb new file mode 100644 index 00000000..6f648b9c --- /dev/null +++ b/lib/powerpoint/views/collage_rel.xml.erb @@ -0,0 +1,9 @@ + + + + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% images.each_with_index do |image, index| %> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% end %> + \ No newline at end of file From b43c60fd827cc2817ce679827c7bdebd7b68fa0c Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:27:52 +0100 Subject: [PATCH 517/561] collage filters --- lib/powerpoint/slide/concept.rb | 4 +-- lib/powerpoint/views/concept.xml.erb | 51 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 7df20909..40b7eb44 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,10 +8,10 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images + attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images, :data def initialize(options={}) - require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images], options + require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images, :data], options options.each {|k, v| instance_variable_set("@#{k}", v)} @images = images @image_y_scale = image_information[1] diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 767bc66e..1db6833e 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -196,6 +196,57 @@ <% end %> + <% legend.each_with_index do |graph_key| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= graph_key['color'] %> + + + + + + + + + + + + + + + + + + + + + + + <% end %> From 505e099a07fc1ad8d77119d165da441fee45349e Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:29:12 +0100 Subject: [PATCH 518/561] collage filters --- lib/powerpoint/presentation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 21c0b010..97342554 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,8 +52,8 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end - def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images) - @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images) + def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images, legend) + @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images, legend: legend) end def add_collage_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images) From a14eb2fa2d253a9a9528a8c96eb33d3e87bcbdf5 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:33:35 +0100 Subject: [PATCH 519/561] collage filters --- lib/powerpoint/slide/concept.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 40b7eb44..6224e07a 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,11 +8,12 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images, :data + attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :legend, :images def initialize(options={}) - require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images, :data], options + require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :legend,:images], options options.each {|k, v| instance_variable_set("@#{k}", v)} + @legend = legend @images = images @image_y_scale = image_information[1] @image_x_scale = image_information[0] From 94b66a8a6b41faa5fa2e401d8ff75f12c4518cc4 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:47:24 +0100 Subject: [PATCH 520/561] collage filters --- lib/powerpoint/slide/concept.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/concept.rb b/lib/powerpoint/slide/concept.rb index 6224e07a..8327b2b5 100644 --- a/lib/powerpoint/slide/concept.rb +++ b/lib/powerpoint/slide/concept.rb @@ -8,10 +8,10 @@ module Slide class Concept include Powerpoint::Util - attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :legend, :images + attr_reader :title, :subtitle,:page_number,:logo, :task_icon, :image_information, :images, :legend def initialize(options={}) - require_arguments [:title, :subtitle,:page_number,:logo, :task_icon, :image_information, :legend,:images], options + require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :image_information, :images, :legend], options options.each {|k, v| instance_variable_set("@#{k}", v)} @legend = legend @images = images From 192ca192690718955f97f3fa197ed7f2aa3f89be Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 15:51:01 +0100 Subject: [PATCH 521/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 1db6833e..99991845 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -207,7 +207,7 @@ - + @@ -223,29 +223,11 @@ - <%= graph_key['color'] %> + <%= graph_key['caption'] %> - - - - - - - - - - - - - - - - - - <% end %> From 8d89f72b535b4b354e0b6beb2787bfc66d563025 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 16:17:53 +0100 Subject: [PATCH 522/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 30 +++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 99991845..e9f093f1 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -197,6 +197,33 @@ <% end %> <% legend.each_with_index do |graph_key| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -223,11 +250,12 @@ - <%= graph_key['caption'] %> + <%= graph_key['label'] %> + <% end %> From 62725cda1884f7edec688211be351704e609f866 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 16:24:16 +0100 Subject: [PATCH 523/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index e9f093f1..01c076dd 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -220,7 +220,7 @@ - + From a602b56e3fe2d61e9d09ee503565ccc27c7d1b91 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 16:43:15 +0100 Subject: [PATCH 524/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 01c076dd..466040cb 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -196,6 +196,7 @@ <% end %> + <% xposition = "1000000" %> <% legend.each_with_index do |graph_key| %> @@ -213,7 +214,7 @@ - + @@ -234,8 +235,8 @@ - - + + From faaf5a69281f991bcce4f1742a684d3ad6484cc3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 16:59:44 +0100 Subject: [PATCH 525/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 466040cb..79ba6278 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -196,7 +196,7 @@ <% end %> - <% xposition = "1000000" %> + <% x_pos_legend = 1000000 %> <% legend.each_with_index do |graph_key| %> @@ -214,7 +214,7 @@ - + @@ -235,7 +235,7 @@ - + From 7f6f2a6a5f168812e97b771152245c0411202b99 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 17:16:24 +0100 Subject: [PATCH 526/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 79ba6278..55268998 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -197,7 +197,7 @@ <% end %> <% x_pos_legend = 1000000 %> - <% legend.each_with_index do |graph_key| %> + <% legend.each_with_index do |graph_key, index| %> From fa7866e2a9558c9ce115aa934c7279dcf651e260 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 26 Feb 2021 17:27:39 +0100 Subject: [PATCH 527/561] collage filters --- lib/powerpoint/views/concept.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index 55268998..c726fe2e 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -214,7 +214,7 @@ - + From e966443be340ef059f2ec20b49c2274bafabdc95 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 14:49:29 +0100 Subject: [PATCH 528/561] gallery template --- lib/powerpoint.rb | 1 + lib/powerpoint/presentation.rb | 4 + lib/powerpoint/slide/gallery.rb | 42 +++ lib/powerpoint/views/gallery.xml | 325 +++++++++++++++++++++++ lib/powerpoint/views/gallery_rel.xml.erb | 9 + 5 files changed, 381 insertions(+) create mode 100644 lib/powerpoint/slide/gallery.rb create mode 100644 lib/powerpoint/views/gallery.xml create mode 100644 lib/powerpoint/views/gallery_rel.xml.erb diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index 778868f7..f56bf95e 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -3,6 +3,7 @@ require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/multiple_image' +require 'powerpoint/slide/gallery' require 'powerpoint/slide/concept' require 'powerpoint/slide/collage' require 'powerpoint/slide/image' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 97342554..36a27b1e 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,6 +52,10 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end + def add_gallery_slide(title, subtitle = nil, question, page_number, logo, task_icon ,images) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, question: question, page_number: page_number, task_icon: task_icon, logo: logo, images: images) + end + def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images, legend) @slides << Powerpoint::Slide::Concept.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, logo: logo, task_icon: task_icon, image_information: image_information, images: images, legend: legend) end diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb new file mode 100644 index 00000000..949c250b --- /dev/null +++ b/lib/powerpoint/slide/gallery.rb @@ -0,0 +1,42 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class MultipleImage + include Powerpoint::Util + + attr_reader :title, :subtitle, :question, :page_number, :logo, :task_icon, :images + + def initialize(options={}) + require_arguments [:title, :subtitle, :question, :page_number, :logo, :task_icon, :images], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @images = images + end + + def save(extract_path, index) + @images.each do |image| + copy_media(extract_path, image[0]) + end + + copy_media(extract_path, logo) + copy_media(extract_path, task_icon) + + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def save_rel_xml(extract_path, index) + render_view('gallery_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('gallery.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/gallery.xml b/lib/powerpoint/views/gallery.xml new file mode 100644 index 00000000..9e357c28 --- /dev/null +++ b/lib/powerpoint/views/gallery.xml @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= page_number %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= question %> + + + + + + <% y_coords = 2664490 %> + <% x_coords = 2392098 %> + <% images.each_with_index do |image, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if image[2].present? %> + + + + + + + + + <%= image[2] %> + + + + <% end %> + <% if image[1].present? %> + + + + + + + + + <%= image[1] %> + + + <% end %> + + + <% end %> + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/gallery_rel.xml.erb b/lib/powerpoint/views/gallery_rel.xml.erb new file mode 100644 index 00000000..412f4699 --- /dev/null +++ b/lib/powerpoint/views/gallery_rel.xml.erb @@ -0,0 +1,9 @@ + + + + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% images.each_with_index do |image, index| %> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + <% end %> + \ No newline at end of file From 6de4130822fd15db0212d05b87899193b82fce46 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:02:43 +0100 Subject: [PATCH 529/561] gallery template --- lib/powerpoint/views/{gallery.xml => gallery.xml.erb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/powerpoint/views/{gallery.xml => gallery.xml.erb} (100%) diff --git a/lib/powerpoint/views/gallery.xml b/lib/powerpoint/views/gallery.xml.erb similarity index 100% rename from lib/powerpoint/views/gallery.xml rename to lib/powerpoint/views/gallery.xml.erb From 587f4273be8f87d252d86a7e76f610f8d0a50144 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:15:42 +0100 Subject: [PATCH 530/561] gallery template --- lib/powerpoint/views/gallery.xml.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 9e357c28..97ffaaea 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -199,7 +199,6 @@ - <% y_coords = 2664490 %> <% x_coords = 2392098 %> <% images.each_with_index do |image, index| %> From 04b9e17daf0c2ea69f6539a5c79d16dfcc30bcc2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:20:20 +0100 Subject: [PATCH 531/561] gallery template --- lib/powerpoint/views/gallery.xml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 97ffaaea..3a7bcfcf 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -162,8 +162,8 @@ - - + + @@ -178,7 +178,7 @@ - + @@ -218,7 +218,7 @@ - + From ad73771b422792526632b0d25e9adf7272b9ccf2 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:41:41 +0100 Subject: [PATCH 532/561] gallery template --- lib/powerpoint/views/gallery.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 3a7bcfcf..d93f7460 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -178,7 +178,7 @@ - + From 9498ee673a135e9aa89a807b3e44cee2d2e28413 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:51:47 +0100 Subject: [PATCH 533/561] gallery template --- lib/powerpoint/slide/gallery.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/gallery.rb b/lib/powerpoint/slide/gallery.rb index 949c250b..71446559 100644 --- a/lib/powerpoint/slide/gallery.rb +++ b/lib/powerpoint/slide/gallery.rb @@ -5,7 +5,7 @@ module Powerpoint module Slide - class MultipleImage + class Gallery include Powerpoint::Util attr_reader :title, :subtitle, :question, :page_number, :logo, :task_icon, :images From edfb88eda29cbdb4a7e4f7d4dcc4520c5db5a13b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 15:57:29 +0100 Subject: [PATCH 534/561] gallery template --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 36a27b1e..1e0dfc6a 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -53,7 +53,7 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon end def add_gallery_slide(title, subtitle = nil, question, page_number, logo, task_icon ,images) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, question: question, page_number: page_number, task_icon: task_icon, logo: logo, images: images) + @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle, question: question, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end def add_concept_slide(title, subtitle = nil, page_number, logo, task_icon, image_information ,images, legend) From 60acc89166c707a0033d534d5b196093640c47b9 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 1 Mar 2021 16:05:51 +0100 Subject: [PATCH 535/561] gallery template --- lib/powerpoint/views/gallery.xml.erb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index d93f7460..73fe1707 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -70,7 +70,6 @@ - <%= subtitle %> @@ -101,7 +100,6 @@ - <%= page_number %> @@ -160,17 +158,15 @@ - - + - - + - + From 84937ec670bd26cc8d3f8e076ceb1a45dd3dd6b6 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Mar 2021 12:17:33 +0100 Subject: [PATCH 536/561] comments --- lib/powerpoint/views/collage_rel.xml.erb | 2 +- lib/powerpoint/views/concept_rel.xml.erb | 2 +- lib/powerpoint/views/multiple_image.xml.erb | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/collage_rel.xml.erb b/lib/powerpoint/views/collage_rel.xml.erb index 6f648b9c..dcdf27f2 100644 --- a/lib/powerpoint/views/collage_rel.xml.erb +++ b/lib/powerpoint/views/collage_rel.xml.erb @@ -2,7 +2,7 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb index 6f648b9c..dcdf27f2 100644 --- a/lib/powerpoint/views/concept_rel.xml.erb +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -2,7 +2,7 @@ " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% end %> diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 336496ba..83f64af9 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -275,6 +275,19 @@ <% end %> + <% if image[3].present? %> + + + + + + + + + <%= image[3] %> + + + <% end %> <% end %> From 036094f46bd1f231d2b5fb7e403894f888c17aa3 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Mar 2021 13:07:27 +0100 Subject: [PATCH 537/561] comments --- lib/powerpoint/views/multiple_image.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 83f64af9..2cc260c8 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -275,7 +275,7 @@ <% end %> - <% if image[3].present? %> + <% if image[4].present? %> @@ -284,7 +284,7 @@ - <%= image[3] %> + <%= image[4] %> <% end %> From 60ade718df5d6d0ce4ff244775cbe787ab9f5532 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Mar 2021 16:29:41 +0100 Subject: [PATCH 538/561] comments --- lib/powerpoint/views/multiple_image.xml.erb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 2cc260c8..275aa9b4 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -276,6 +276,7 @@ <% end %> <% if image[4].present? %> + <% image[4].each do |comment| %> @@ -284,9 +285,21 @@ - <%= image[4] %> + <%= comment[0] %> + + + + + + + + + <%= comment[1] %> + + + <% end> <% end %> From 3948c470827f3a4d8f199f6856c2ec6dabf33dac Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Tue, 2 Mar 2021 16:32:26 +0100 Subject: [PATCH 539/561] comments --- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index 275aa9b4..eb15c30d 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -299,7 +299,7 @@ <%= comment[1] %> - <% end> + <% end %> <% end %> From 2030c56db66904c72e0f471617db659e9eab81ca Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 11:03:03 +0100 Subject: [PATCH 540/561] post comments in gallery --- lib/powerpoint.rb | 1 + lib/powerpoint/presentation.rb | 4 + lib/powerpoint/views/comment.rb | 39 +++++ lib/powerpoint/views/comment.xml.erb | 179 +++++++++++++++++++++++ lib/powerpoint/views/comment_rel.xml.erb | 6 + 5 files changed, 229 insertions(+) create mode 100644 lib/powerpoint/views/comment.rb create mode 100644 lib/powerpoint/views/comment.xml.erb create mode 100644 lib/powerpoint/views/comment_rel.xml.erb diff --git a/lib/powerpoint.rb b/lib/powerpoint.rb index f56bf95e..182fbfda 100644 --- a/lib/powerpoint.rb +++ b/lib/powerpoint.rb @@ -3,6 +3,7 @@ require 'powerpoint/slide/intro' require 'powerpoint/slide/extended_intro' require 'powerpoint/slide/multiple_image' +require 'powerpoint/slide/comment' require 'powerpoint/slide/gallery' require 'powerpoint/slide/concept' require 'powerpoint/slide/collage' diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 1e0dfc6a..07a07972 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,6 +52,10 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end + def add_comment_slide(title, subtitle = nil, page_number, logo, task_icon ,comments) + @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, comments: comments) + end + def add_gallery_slide(title, subtitle = nil, question, page_number, logo, task_icon ,images) @slides << Powerpoint::Slide::Gallery.new(presentation: self, title: title, subtitle: subtitle, question: question, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end diff --git a/lib/powerpoint/views/comment.rb b/lib/powerpoint/views/comment.rb new file mode 100644 index 00000000..c9cea1ce --- /dev/null +++ b/lib/powerpoint/views/comment.rb @@ -0,0 +1,39 @@ +require 'zip/filesystem' +require 'fileutils' +require 'fastimage' +require 'erb' + +module Powerpoint + module Slide + class Comment + include Powerpoint::Util + + attr_reader :title, :subtitle, :page_number, :logo, :task_icon, :comments + + def initialize(options={}) + require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :comments], options + options.each {|k, v| instance_variable_set("@#{k}", v)} + @comments = comments + end + + def save(extract_path, index) + + copy_media(extract_path, logo) + copy_media(extract_path, task_icon) + + save_rel_xml(extract_path, index) + save_slide_xml(extract_path, index) + end + + def save_rel_xml(extract_path, index) + render_view('multiple_image_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + end + private :save_rel_xml + + def save_slide_xml(extract_path, index) + render_view('multiple_image.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + end + private :save_slide_xml + end + end +end \ No newline at end of file diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb new file mode 100644 index 00000000..4c0b2e8c --- /dev/null +++ b/lib/powerpoint/views/comment.xml.erb @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= title %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= subtitle %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= page_number %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/powerpoint/views/comment_rel.xml.erb b/lib/powerpoint/views/comment_rel.xml.erb new file mode 100644 index 00000000..d98574fe --- /dev/null +++ b/lib/powerpoint/views/comment_rel.xml.erb @@ -0,0 +1,6 @@ + + + + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> + \ No newline at end of file From db69d7640a83ee7b2ebda7db604aa2334b747287 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 11:30:09 +0100 Subject: [PATCH 541/561] post comments in gallery --- lib/powerpoint/{views => slide}/comment.rb | 0 lib/powerpoint/views/comment.xml.erb | 45 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) rename lib/powerpoint/{views => slide}/comment.rb (100%) diff --git a/lib/powerpoint/views/comment.rb b/lib/powerpoint/slide/comment.rb similarity index 100% rename from lib/powerpoint/views/comment.rb rename to lib/powerpoint/slide/comment.rb diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index 4c0b2e8c..b19e6769 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -166,6 +166,51 @@ + <% y_coords = 221510 %> + <% x_coords = 145000 %> + <% comments.each_with_index do |comment, index| %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= comment[0] %> + + + + + + + + + + + <%= comment[1] %> + + + <% end %> From 08b6edcc3e5a2d42743ebc51c85f2c10ee7d8f63 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 12:25:06 +0100 Subject: [PATCH 542/561] post comments in gallery --- lib/powerpoint/slide/comment.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index c9cea1ce..6ee54773 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -26,12 +26,12 @@ def save(extract_path, index) end def save_rel_xml(extract_path, index) - render_view('multiple_image_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('commeny_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml def save_slide_xml(extract_path, index) - render_view('multiple_image.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") + render_view('comment.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml") end private :save_slide_xml end From 4d4f5d25c89cf18fa665405a2ac749db6f5fe090 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 12:25:58 +0100 Subject: [PATCH 543/561] post comments in gallery --- lib/powerpoint/slide/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index 6ee54773..60eff8f4 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -26,7 +26,7 @@ def save(extract_path, index) end def save_rel_xml(extract_path, index) - render_view('commeny_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) + render_view('comment_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", index: index) end private :save_rel_xml From 9eef9062bd0a18e244b4fbe8c3d5d343fc736547 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 12:30:40 +0100 Subject: [PATCH 544/561] post comments in gallery --- lib/powerpoint/presentation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 07a07972..1515e5c3 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -53,7 +53,7 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon end def add_comment_slide(title, subtitle = nil, page_number, logo, task_icon ,comments) - @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, comments: comments) + @slides << Powerpoint::Slide::Comment.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, comments: comments) end def add_gallery_slide(title, subtitle = nil, question, page_number, logo, task_icon ,images) From ae4a3e8dc2a9156729d1875b36657cbaabc74ca1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 13:10:30 +0100 Subject: [PATCH 545/561] post comments in gallery --- lib/powerpoint/views/comment.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index b19e6769..5d19e998 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -177,7 +177,7 @@ - + From fee7bd6285a1f48697d0998b724c65ee36e23502 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 13:44:13 +0100 Subject: [PATCH 546/561] post comments in gallery --- lib/powerpoint/views/comment.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index 5d19e998..b0c36030 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -177,7 +177,7 @@ - + From 70a92aa6d97a65e12bd57d93c301c80e6ae1da7d Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 14:21:57 +0100 Subject: [PATCH 547/561] post comments in gallery --- lib/powerpoint/slide/comment.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index 60eff8f4..8a705215 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -13,7 +13,8 @@ class Comment def initialize(options={}) require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :comments], options options.each {|k, v| instance_variable_set("@#{k}", v)} - @comments = comments + puts comments.inspect + puts '************' end def save(extract_path, index) From 5b54430032afc60e74cbecd20e3f4b5159d6ecf8 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 14:27:27 +0100 Subject: [PATCH 548/561] post comments in gallery --- lib/powerpoint/slide/comment.rb | 3 +-- lib/powerpoint/views/comment.xml.erb | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index 8a705215..6f6ad682 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -13,8 +13,7 @@ class Comment def initialize(options={}) require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :comments], options options.each {|k, v| instance_variable_set("@#{k}", v)} - puts comments.inspect - puts '************' + end def save(extract_path, index) diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index b0c36030..7d6c8c90 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -169,7 +169,7 @@ <% y_coords = 221510 %> <% x_coords = 145000 %> <% comments.each_with_index do |comment, index| %> - + @@ -209,7 +209,9 @@ <%= comment[1] %> - + + + <% end %> From 039e0ee92bc3eb119f2c07b28e9ad22921f505eb Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 14:34:08 +0100 Subject: [PATCH 549/561] post comments in gallery --- lib/powerpoint/views/comment.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index 7d6c8c90..c8e67bed 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -166,7 +166,7 @@ - <% y_coords = 221510 %> + <% y_coords = 621510 %> <% x_coords = 145000 %> <% comments.each_with_index do |comment, index| %> @@ -177,7 +177,7 @@ - + From 38a05efb664f7b6f7e646723a5f7ad89a2390c62 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 15:59:44 +0100 Subject: [PATCH 550/561] post comments in gallery --- lib/powerpoint/presentation.rb | 4 ++-- lib/powerpoint/slide/comment.rb | 4 ++-- lib/powerpoint/views/comment.xml.erb | 33 +++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/lib/powerpoint/presentation.rb b/lib/powerpoint/presentation.rb index 1515e5c3..55ead7da 100644 --- a/lib/powerpoint/presentation.rb +++ b/lib/powerpoint/presentation.rb @@ -52,8 +52,8 @@ def add_multiple_image_slide(title, subtitle = nil, page_number, logo, task_icon @slides << Powerpoint::Slide::MultipleImage.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, images: images) end - def add_comment_slide(title, subtitle = nil, page_number, logo, task_icon ,comments) - @slides << Powerpoint::Slide::Comment.new(presentation: self, title: title, subtitle: subtitle, page_number: page_number, task_icon: task_icon, logo: logo, comments: comments) + def add_comment_slide(title, subtitle = nil, user, page_number, logo, task_icon ,comments) + @slides << Powerpoint::Slide::Comment.new(presentation: self, title: title, subtitle: subtitle, user: user, page_number: page_number, task_icon: task_icon, logo: logo, comments: comments) end def add_gallery_slide(title, subtitle = nil, question, page_number, logo, task_icon ,images) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index 6f6ad682..9e32f4e8 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -8,10 +8,10 @@ module Slide class Comment include Powerpoint::Util - attr_reader :title, :subtitle, :page_number, :logo, :task_icon, :comments + attr_reader :title, :subtitle, :user :page_number, :logo, :task_icon, :comments def initialize(options={}) - require_arguments [:title, :subtitle, :page_number, :logo, :task_icon, :comments], options + require_arguments [:title, :subtitle, :user, :page_number, :logo, :task_icon, :comments], options options.each {|k, v| instance_variable_set("@#{k}", v)} end diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index c8e67bed..1a7f1d58 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -166,6 +166,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + <%= user %> + + + + <% y_coords = 621510 %> <% x_coords = 145000 %> <% comments.each_with_index do |comment, index| %> @@ -177,7 +208,7 @@ - + From 7c1d250ac3a0d0e5b1a92a30d0a0fe94fc5fcf1a Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Thu, 4 Mar 2021 16:23:10 +0100 Subject: [PATCH 551/561] post comments in gallery --- lib/powerpoint/slide/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/slide/comment.rb b/lib/powerpoint/slide/comment.rb index 9e32f4e8..6cda5602 100644 --- a/lib/powerpoint/slide/comment.rb +++ b/lib/powerpoint/slide/comment.rb @@ -8,7 +8,7 @@ module Slide class Comment include Powerpoint::Util - attr_reader :title, :subtitle, :user :page_number, :logo, :task_icon, :comments + attr_reader :title, :subtitle, :user, :page_number, :logo, :task_icon, :comments def initialize(options={}) require_arguments [:title, :subtitle, :user, :page_number, :logo, :task_icon, :comments], options From accf9e00433c3d18c7be244aa1cb502f63f98ed0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Mar 2021 13:36:30 +0100 Subject: [PATCH 552/561] post questions in gallery --- lib/powerpoint/views/gallery.xml.erb | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 73fe1707..5fdea51d 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -277,7 +277,7 @@ - <% if image[2].present? %> + <% if image[1].present? %> @@ -286,12 +286,13 @@ - <%= image[2] %> + <%= image[1] %> <% end %> - <% if image[1].present? %> + <% if image[2].present? %> + <% image[2].each do |questions| @@ -300,9 +301,23 @@ - <%= image[1] %> + <%= questions[0] %> + <% questions[1].each do |answer| %> + + + + + + + + + <%= answer %> + + + <% end %> + <% end %> <% end %> From d2c15f8fab69ec4253f716fbf87acf31253d1b49 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Mar 2021 14:02:03 +0100 Subject: [PATCH 553/561] post comments in gallery --- lib/powerpoint/views/gallery.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 5fdea51d..df784361 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -292,7 +292,7 @@ <% end %> <% if image[2].present? %> - <% image[2].each do |questions| + <% image[2].each do |questions| %> From a82cc1ac366a9462250f0cd57eac6018025729d1 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Mar 2021 17:47:56 +0100 Subject: [PATCH 554/561] post comments in gallery --- lib/powerpoint/views/gallery_rel.xml.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/powerpoint/views/gallery_rel.xml.erb b/lib/powerpoint/views/gallery_rel.xml.erb index 412f4699..e8b1a7e7 100644 --- a/lib/powerpoint/views/gallery_rel.xml.erb +++ b/lib/powerpoint/views/gallery_rel.xml.erb @@ -1,6 +1,5 @@ - " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> From cf4ec9daf47336ebe5392f302bca8e143d1e1bcf Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Fri, 5 Mar 2021 17:55:45 +0100 Subject: [PATCH 555/561] post comments in gallery --- lib/powerpoint/views/gallery_rel.xml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/powerpoint/views/gallery_rel.xml.erb b/lib/powerpoint/views/gallery_rel.xml.erb index e8b1a7e7..d64f0607 100644 --- a/lib/powerpoint/views/gallery_rel.xml.erb +++ b/lib/powerpoint/views/gallery_rel.xml.erb @@ -1,5 +1,6 @@ + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> From 3d92c475db0cd562ba7aeb0b7d299352699b4ae0 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 13:47:20 +0100 Subject: [PATCH 556/561] make relationship to layout extend beyond 11 --- lib/powerpoint/views/collage_rel.xml.erb | 2 +- lib/powerpoint/views/comment_rel.xml.erb | 2 +- lib/powerpoint/views/concept_rel.xml.erb | 2 +- lib/powerpoint/views/dashboard_rel.xml.erb | 2 +- lib/powerpoint/views/dashboard_user_rel.xml.erb | 2 +- lib/powerpoint/views/extended_intro_slide_rel.xml.erb | 4 +++- lib/powerpoint/views/image_rel.xml.erb | 2 +- lib/powerpoint/views/multiple_image_rel.xml.erb | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/powerpoint/views/collage_rel.xml.erb b/lib/powerpoint/views/collage_rel.xml.erb index dcdf27f2..741e4c9b 100644 --- a/lib/powerpoint/views/collage_rel.xml.erb +++ b/lib/powerpoint/views/collage_rel.xml.erb @@ -1,6 +1,6 @@ - + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> diff --git a/lib/powerpoint/views/comment_rel.xml.erb b/lib/powerpoint/views/comment_rel.xml.erb index d98574fe..b1b7a2f9 100644 --- a/lib/powerpoint/views/comment_rel.xml.erb +++ b/lib/powerpoint/views/comment_rel.xml.erb @@ -1,6 +1,6 @@ - + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> \ No newline at end of file diff --git a/lib/powerpoint/views/concept_rel.xml.erb b/lib/powerpoint/views/concept_rel.xml.erb index dcdf27f2..741e4c9b 100644 --- a/lib/powerpoint/views/concept_rel.xml.erb +++ b/lib/powerpoint/views/concept_rel.xml.erb @@ -1,6 +1,6 @@ - + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> diff --git a/lib/powerpoint/views/dashboard_rel.xml.erb b/lib/powerpoint/views/dashboard_rel.xml.erb index 777b168c..c7583ca0 100644 --- a/lib/powerpoint/views/dashboard_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_rel.xml.erb @@ -1,6 +1,6 @@ - + diff --git a/lib/powerpoint/views/dashboard_user_rel.xml.erb b/lib/powerpoint/views/dashboard_user_rel.xml.erb index d6c9b2b4..3045322e 100644 --- a/lib/powerpoint/views/dashboard_user_rel.xml.erb +++ b/lib/powerpoint/views/dashboard_user_rel.xml.erb @@ -1,6 +1,6 @@ - + <% images.each_with_index do |image, index| %> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> diff --git a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb index 7fc992d0..81da0412 100644 --- a/lib/powerpoint/views/extended_intro_slide_rel.xml.erb +++ b/lib/powerpoint/views/extended_intro_slide_rel.xml.erb @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/lib/powerpoint/views/image_rel.xml.erb b/lib/powerpoint/views/image_rel.xml.erb index f7d5ed87..608e80ea 100644 --- a/lib/powerpoint/views/image_rel.xml.erb +++ b/lib/powerpoint/views/image_rel.xml.erb @@ -1,6 +1,6 @@ - + <% images.each_with_index do |image, index| %> <% end %> diff --git a/lib/powerpoint/views/multiple_image_rel.xml.erb b/lib/powerpoint/views/multiple_image_rel.xml.erb index 412f4699..d64f0607 100644 --- a/lib/powerpoint/views/multiple_image_rel.xml.erb +++ b/lib/powerpoint/views/multiple_image_rel.xml.erb @@ -1,6 +1,6 @@ - + " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> " Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/> <% images.each_with_index do |image, index| %> From 40cdf1c74b18b80ee6a72cef2df87b5dbf5c2d90 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 15:02:35 +0100 Subject: [PATCH 557/561] line breaks in gallery --- lib/powerpoint/views/gallery.xml.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index df784361..4555e8f6 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -288,6 +288,7 @@ <%= image[1] %> + <% end %> @@ -303,6 +304,8 @@ <%= questions[0] %> + + <% questions[1].each do |answer| %> @@ -315,6 +318,8 @@ <%= answer %> + + <% end %> <% end %> From ef1b104a9b77a50690c4fad81864f4d70b567b6f Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 15:03:00 +0100 Subject: [PATCH 558/561] line breaks in gallery --- lib/powerpoint/views/gallery.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 4555e8f6..bf12a5c0 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -87,7 +87,7 @@ - + From 56f6cd814ed652e4302088cd8fcae2748b5df548 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 15:19:15 +0100 Subject: [PATCH 559/561] page number extend --- lib/powerpoint/views/collage.xml.erb | 2 +- lib/powerpoint/views/comment.xml.erb | 2 +- lib/powerpoint/views/concept.xml.erb | 2 +- lib/powerpoint/views/dashboard.xml.erb | 2 +- lib/powerpoint/views/dashboard_user.xml.erb | 2 +- lib/powerpoint/views/gallery.xml.erb | 2 +- lib/powerpoint/views/multiple_image.xml.erb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/powerpoint/views/collage.xml.erb b/lib/powerpoint/views/collage.xml.erb index d046ede4..ede1502a 100644 --- a/lib/powerpoint/views/collage.xml.erb +++ b/lib/powerpoint/views/collage.xml.erb @@ -87,7 +87,7 @@ - + diff --git a/lib/powerpoint/views/comment.xml.erb b/lib/powerpoint/views/comment.xml.erb index 1a7f1d58..ece02274 100644 --- a/lib/powerpoint/views/comment.xml.erb +++ b/lib/powerpoint/views/comment.xml.erb @@ -88,7 +88,7 @@ - + diff --git a/lib/powerpoint/views/concept.xml.erb b/lib/powerpoint/views/concept.xml.erb index c726fe2e..8a2364dc 100644 --- a/lib/powerpoint/views/concept.xml.erb +++ b/lib/powerpoint/views/concept.xml.erb @@ -87,7 +87,7 @@ - + diff --git a/lib/powerpoint/views/dashboard.xml.erb b/lib/powerpoint/views/dashboard.xml.erb index 59581007..d61f4191 100644 --- a/lib/powerpoint/views/dashboard.xml.erb +++ b/lib/powerpoint/views/dashboard.xml.erb @@ -87,7 +87,7 @@ - + diff --git a/lib/powerpoint/views/dashboard_user.xml.erb b/lib/powerpoint/views/dashboard_user.xml.erb index 74b6654d..56f37e98 100644 --- a/lib/powerpoint/views/dashboard_user.xml.erb +++ b/lib/powerpoint/views/dashboard_user.xml.erb @@ -87,7 +87,7 @@ - + diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index bf12a5c0..43e1a76e 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -214,7 +214,7 @@ - + diff --git a/lib/powerpoint/views/multiple_image.xml.erb b/lib/powerpoint/views/multiple_image.xml.erb index eb15c30d..6c8a9b35 100644 --- a/lib/powerpoint/views/multiple_image.xml.erb +++ b/lib/powerpoint/views/multiple_image.xml.erb @@ -88,7 +88,7 @@ - + From 20eb42c264048a272971334f8cd893b2e4ce9846 Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 16:59:40 +0100 Subject: [PATCH 560/561] page number extend --- lib/powerpoint/views/gallery.xml.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index 43e1a76e..a74e2d72 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -214,7 +214,7 @@ - + @@ -266,7 +266,7 @@ - + From 7ad2e1ab73ff53d83ef51c4214ebe241b918203b Mon Sep 17 00:00:00 2001 From: Bob Foreman Date: Mon, 8 Mar 2021 17:33:37 +0100 Subject: [PATCH 561/561] page number extend --- lib/powerpoint/views/gallery.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/powerpoint/views/gallery.xml.erb b/lib/powerpoint/views/gallery.xml.erb index a74e2d72..6540ef32 100644 --- a/lib/powerpoint/views/gallery.xml.erb +++ b/lib/powerpoint/views/gallery.xml.erb @@ -87,7 +87,7 @@ - +