Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Sprint30 #10

Merged
merged 41 commits into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ff3ebab
fixed ipdb issue
Feb 14, 2020
674575b
schedule H1 print issues
Yeswantht Mar 4, 2020
81d8ca7
Merge pull request #134 from SalientCRGT-FEC/FNE_2152_YESWANTH_SPRINT29
Yeswantht Mar 4, 2020
b9b9d53
changes
Yeswantht Mar 5, 2020
4b0d8d0
changes
Yeswantht Mar 5, 2020
be5e482
final changes for SCHED_H3
Yeswantht Mar 5, 2020
87bc5e4
Merge pull request #135 from SalientCRGT-FEC/FNE_2153_YESWANTH_SPRINT_29
Yeswantht Mar 5, 2020
1f7690b
SH3 CHANGES
Yeswantht Mar 6, 2020
a92e382
Merge pull request #136 from SalientCRGT-FEC/FNE_2153_YESWANTH_SPRINT_29
Yeswantht Mar 6, 2020
88770d8
changes
Yeswantht Mar 8, 2020
7f9ec7d
changes
Yeswantht Mar 8, 2020
1288c4d
final changes for sh3
Yeswantht Mar 9, 2020
bbe76f6
Merge branch 'develop' of github.com:SalientCRGT-FEC/fecfile-ImageGen…
Mar 9, 2020
77604a6
Merge pull request #137 from SalientCRGT-FEC/FNE_2153_YESWANTH_SPRINT_29
Yeswantht Mar 9, 2020
5f1b130
Merge branch 'develop' of github.com:SalientCRGT-FEC/fecfile-ImageGen…
Mar 9, 2020
d4ca733
Updated MarkupSafe to version 1.1.1
Mar 9, 2020
2b0738e
Merge pull request #138 from SalientCRGT-FEC/markupsafe-hotfix-Roberto
rsanchez-s Mar 9, 2020
a65205e
Fne all satheesh sprint28 (#139)
spanyala Mar 13, 2020
1b00fbe
Merge pull request #140 from SalientCRGT-FEC/release
rsanchez-s Mar 19, 2020
af73fdc
FNE-1665-Sprint30-Megha
MeghaA05 Apr 2, 2020
f568790
Update form3x.py
MeghaA05 Apr 2, 2020
a72baba
Merge pull request #141 from SalientCRGT-FEC/FNE-1665-Sprint30-Megha
MeghaA05 Apr 2, 2020
ffb27af
Update SA.pdf
MeghaA05 Apr 3, 2020
8c6d898
Merge pull request #142 from SalientCRGT-FEC/FNE-1665-Sprint30-Megha
MeghaA05 Apr 3, 2020
8f317ce
Update SH1.pdf
MeghaA05 Apr 3, 2020
754bc2a
Merge pull request #143 from SalientCRGT-FEC/FNE-2236-Sprint30-Megha
MeghaA05 Apr 3, 2020
96a788d
percentage fix for H1
MeghaA05 Apr 6, 2020
913973d
Merge pull request #144 from SalientCRGT-FEC/FNE-2233-Sprint30-Megha
MeghaA05 Apr 6, 2020
55702d5
fixing decimal issues
MeghaA05 Apr 7, 2020
6ceefa6
Merge pull request #146 from SalientCRGT-FEC/FNE-2237-Sprint30-Megha_1
MeghaA05 Apr 7, 2020
495d79f
election code and year issue
MeghaA05 Apr 7, 2020
e660a83
election code and year issue
MeghaA05 Apr 7, 2020
4b814c2
Merge pull request #147 from SalientCRGT-FEC/FNE-1665-Sprint30-Megha_1
MeghaA05 Apr 7, 2020
a5716c7
schd A error fix
MeghaA05 Apr 9, 2020
e37154a
Merge pull request #148 from SalientCRGT-FEC/FNE-2249-Sprint30-Megha
rsanchez-s Apr 9, 2020
1ecb712
Merge pull request #149 from SalientCRGT-FEC/release
rsanchez-s Apr 9, 2020
70334eb
Fne all satheesh sprint28 (#150)
spanyala Apr 16, 2020
b38ea76
spliting single run command to download wkhtmltopdf
Apr 21, 2020
717905d
Merge pull request #151 from SalientCRGT-FEC/hotfix-Roberto-31
rsanchez-s Apr 21, 2020
06f41ce
Merge pull request #152 from SalientCRGT-FEC/release
rsanchez-s Apr 21, 2020
658d708
Merge branch 'master' of github.com:SalientCRGT-FEC/fecfile-ImageGene…
Apr 21, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ DEBIAN_FRONTEND=nointeractive apt-get update && apt-get install -y apt-utils &&
RUN rm -rf /var/lib/apt/lists/* \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

RUN wget --quiet -O wkhtmltopdf.tar.xz "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz" && \
tar -xvf wkhtmltopdf.tar.xz && \
mv wkhtmltox/bin/wkhtmlto* /usr/bin/
RUN wget --quiet -O wkhtmltopdf.tar.xz "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz"
RUN tar -xvf wkhtmltopdf.tar.xz
RUN mv wkhtmltox/bin/wkhtmlto* /usr/bin/

ENV LANG en_US.utf8

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ Flask-HTTPAuth==3.2.4
idna==2.7
itsdangerous==0.24
Jinja2==2.10.1
MarkupSafe==1.0
MarkupSafe==1.1.1
passlib==1.7.1
python-json-logger==0.1.9
requests==2.22.0
six==1.11.0
urllib3==1.25.3
Werkzeug==0.15.3
WeasyPrint==47

ipdb==0.12.3
pypdftk==0.4
boto3==1.9.40
botocore==1.12.196
Expand Down
108 changes: 65 additions & 43 deletions routes/src/form3x.py

Large diffs are not rendered by default.

Binary file modified templates/forms/F3X.pdf
Binary file not shown.
Binary file modified templates/forms/SA.pdf
Binary file not shown.
Binary file modified templates/forms/SC.pdf
Binary file not shown.
Binary file modified templates/forms/SC1.pdf
Binary file not shown.
Binary file modified templates/forms/SD.pdf
Binary file not shown.
Binary file modified templates/forms/SE.pdf
Binary file not shown.
Binary file modified templates/forms/SF.pdf
Binary file not shown.
Binary file modified templates/forms/SH1.pdf
Binary file not shown.
Binary file modified templates/forms/SH2.pdf
Binary file not shown.
Binary file modified templates/forms/SH3.pdf
Binary file not shown.
Binary file modified templates/forms/SH4.pdf
Binary file not shown.
Binary file modified templates/forms/SH5.pdf
Binary file not shown.
Binary file modified templates/forms/SH6.pdf
Binary file not shown.
Binary file modified templates/forms/SL-A.pdf
Binary file not shown.
Binary file modified templates/forms/SL-B.pdf
Binary file not shown.
Binary file modified templates/forms/SL.pdf
Binary file not shown.