Compare commits

..

No commits in common. "dd9215ec9fbe0fc24f15f7513b0adbc799538a61" and "5a23f6e62bb709cf6e00fbf7475b41dfe1e80c2e" have entirely different histories.

6 changed files with 15 additions and 45 deletions

29
.gitattributes vendored
View File

@ -1,29 +0,0 @@
# Default behavior: if Git thinks a file is text (as opposed to binary), it
# will normalize line endings to LF in the repository, but convert to your
# platform's native line endings on checkout (e.g., CRLF for Windows).
* text=auto
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout. E.g.,
# *.txt text
# Declare files that will always have CRLF line endings on checkout. E.g.,
#*.sln text eol=crlf
# Declare files that will always have LF line endings on checkout. E.g.,
*.sh text eol=lf
*.json text eol=lf
# Denote all files that should not have line endings normalized, should not be
# merged, and should not show in a textual diff.
*.docm binary
*.docx binary
*.odf binary
*.xlsx binary
*.ico binary
*.lib binary
*.png binary
*.pptx binary
*.snk binary
*.vsdx binary
*.xps binary

View File

@ -41,13 +41,13 @@ function sanitizeRecord(record)
const noData="нет данных";
for (var i = 0; i < record.length; ++i)
{
if (!record[i] || (""+record[i]).trim().toLowerCase() == noData)
if ((""+record[i]).trim().toLowerCase() == noData)
{
record[i] = "";
}
else
else if(!record[i])
{
record[i] = ""+record[i];
record[i] = "";
}
}
return record;
@ -69,23 +69,23 @@ async function populateBallot(template, record){
patches: {
APT_NUM: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[2])],
children: [ new TextRun(""+record[2])],
},
FIO: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[3])],
children: [ new TextRun(""+record[3])],
},
APT_AREA: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[5])],
children: [ new TextRun(""+record[5])],
},
SHARE: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[6])],
children: [ new TextRun(""+record[6])],
},
DOCUMENT_NUM: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[8])],
children: [ new TextRun(""+record[8])],
},
DOCUMENT_DATE: {
type: PatchType.PARAGRAPH,
@ -93,7 +93,7 @@ async function populateBallot(template, record){
},
SNILS: {
type: PatchType.PARAGRAPH,
children: [ new TextRun(record[10])],
children: [ new TextRun(""+record[10])],
}
},
});

View File

@ -4,9 +4,9 @@
<title>ЖСК Мечта - генерация бюллетеней</title>
<link rel="stylesheet" href="style.css"/>
<script src="scripts/lib/csv.js"></script>
<script src="scripts/lib/jszip.min.js"></script>
<script src="scripts/create-ballots.js" type="module"></script>
<script src="dist/csv.js"></script>
<script src="dist/jszip.min.js"></script>
<script src="create-ballots.js" type="module"></script>
</head>
<body>
@ -32,5 +32,5 @@
<progress class="hidden" id="progressbar"> </progress>
<br>
<textarea readonly class="output" id="output_text"> </textarea>
<textarea readonly id="output_text"> </textarea>
</body>

View File

@ -15,10 +15,9 @@ input[type="file"]{
field-sizing: content;
}
textarea.output
textarea#output_text
{
width: 400px;
height: 400px;
overflow-y: scroll;
resize: none;
}