consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,040 Commits 1 Branch 0 Tags
166caa3b4c01ca65857ec408024bbd8a1ba69337
Commit Graph

118 Commits

Author SHA1 Message Date
iagirre
166caa3b4c Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first. 
Added missing text for english and new texts in english and spanish.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/participation.scss
	modificado:    app/models/concerns/imageable.rb
	modificado:    app/models/poll.rb
	modificado:    app/views/admin/poll/polls/_form.html.erb
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    config/locales/en/images.yml
	modificado:    config/locales/es/admin.yml
	modificado:    config/locales/es/images.yml
	modificado:    spec/features/admin/poll/polls_spec.rb
 2017-10-02 12:59:26 +02:00
iagirre
c67620fdef Table for links added (links to add images/documents). 
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
 2017-09-29 14:51:49 +02:00
iagirre
77d0a551cf Migration for adding summary and description to polls created. Both text_areas were added to polls form. 
Imageable class included in polls model and the first aproach for adding images added to form.
 2017-09-28 17:46:30 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
Bertocq
f40a0d09ed Add Shift vote and recount date ranges, filter selected one on controller 2017-09-27 18:08:03 +02:00
decabeza
407c0fc702 fixes styles for filters, orders and subnavs on admin 2017-09-27 17:57:54 +02:00
Bertocq
ce92dcd088 Add Task selection on Poll Shift creation, and on shifts table 2017-09-27 14:05:25 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
Bertocq
630a3252b7 Fix admin poll officers assignments by officer view 2017-09-19 01:38:02 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99 Replace FinalResult with TotalResult at admin BoothAssignment show 2017-09-19 00:45:13 +02:00
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +02:00
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents 
Poll questions document and video
 2017-09-11 00:08:31 +02:00
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
rgarcia
9181610de9 removes obsolete code 2017-08-04 21:27:30 +02:00
rgarcia
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
decabeza
98961748ad replaces more old back link partial to new back_link_to helper 2017-07-27 00:26:39 +02:00
decabeza
6c5513ab38 replaces back_link partial to back_link_to helper 2017-07-26 18:22:45 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02:00
Juanjo Bazán
d68be1f6f0 adds automatic recount to admin poll and paginates recounts 2017-02-14 19:44:19 +01:00
Juanjo Bazán
2b68f02b95 paginates booths 2017-02-14 19:09:31 +01:00
Juanjo Bazán
8129131a3c adds pagination to officer assignments 2017-02-14 19:09:19 +01:00
Alberto Garcia Cabeza
799bbbe6cb fixes ul close tag on admin polls subnav 2017-02-14 16:40:18 +01:00
Juanjo Bazán
e04cc55eb7 shows add booth link only for not assigned booths 2017-02-14 16:07:34 +01:00
Juanjo Bazán
c359b93fd0 fixes booth search in admin 2017-02-14 16:01:09 +01:00
Juanjo Bazán
2d722f1ad4 redux admin poll subnav 2017-02-14 14:57:49 +01:00
Juanjo Bazán
0bd87c7e43 extracts results from admin's poll/show 2017-02-14 14:26:46 +01:00
Juanjo Bazán
bedb9f29e7 extracts recounting from admin's poll/show 2017-02-14 14:07:22 +01:00
Juanjo Bazán
19ec7f93b3 extracts officer_assignments from admin's poll/show 2017-02-14 13:47:33 +01:00
Juanjo Bazán
20e31133a8 extracts booth_assignment from admin's poll/show 2017-02-14 13:00:19 +01:00
Juanjo Bazán
711c2280c6 avoids duplicate entries in officers list 2017-02-12 20:10:02 +01:00
Alberto Garcia Cabeza
f7971a3c9f improves tables layout on admin polls show views 2017-02-09 19:03:06 +01:00
Alberto Garcia Cabeza
ff0013e60c improves table layout on admin poll questions 2017-02-09 18:48:06 +01:00
Alberto Garcia Cabeza
b4660e162a improves table layout on admin polls index 2017-02-09 18:38:56 +01:00
Alberto Garcia Cabeza
0025b7faec adds link to configure poll (poll show) on admin poll index 2017-02-08 22:23:17 +01:00
Juanjo Bazán
35540cdcf1 adds poll results to admin 
simple page shows results by question, white and null results
 2017-02-06 17:12:54 +01:00
Juanjo Bazán
01a52cc61a fixes ambiguous match error in specs 2017-01-31 19:09:58 +01:00
Juanjo Bazán
a05297ea1a adds Recounting tab to Poll's admin show view 2017-01-31 13:40:53 +01:00
Juanjo Bazán
547168be3f adds recounts to poll_officer view in admin zone 
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
 2017-01-31 12:38:53 +01:00