From 2c876019b88a2470332c27aed0acaa8fbbdaa1b2 Mon Sep 17 00:00:00 2001 From: Mauro MSL Date: Tue, 10 Dec 2024 17:22:46 +0000 Subject: [PATCH] Revert "Add 'src/typesetting/' from commit '7fd3c7aa61eac5b69588d286ffea51406d99be2e'" This reverts commit a370183d8bed035202ce42ce2f08093d4e03e93a, reversing changes made to 038db4d74a6706c2625979a1a1c023f710dcbd23. --- src/typesetting/.gitignore | 131 -- src/typesetting/LICENSE | 661 ------- src/typesetting/README.md | 9 - src/typesetting/__init__.py | 0 src/typesetting/admin.py | 173 -- src/typesetting/admin_utils.py | 33 - src/typesetting/forms.py | 300 ---- src/typesetting/hooks.py | 28 - src/typesetting/install/settings.json | 371 ---- src/typesetting/logic.py | 342 ---- src/typesetting/migrations/0001_initial.py | 33 - .../migrations/0002_typesettinground.py | 29 - .../migrations/0003_typesettingassignment.py | 40 - .../migrations/0004_auto_20200210_1412.py | 21 - .../migrations/0005_auto_20200220_1158.py | 49 - .../migrations/0006_auto_20200227_1051.py | 29 - .../0007_typesettingassignment_cancelled.py | 20 - .../migrations/0008_auto_20200316_1231.py | 34 - .../migrations/0009_typesettingcorrection.py | 29 - .../migrations/0010_auto_20200428_1701.py | 45 - .../migrations/0011_auto_20200713_1317.py | 20 - .../migrations/0012_auto_20210121_1729.py | 52 - .../migrations/0012_auto_20210126_1203.py | 25 - .../migrations/0013_merge_20210205_1049.py | 16 - .../0014_alter_galleyproofing_manager.py | 26 - .../migrations/0015_article_title_safe.py | 66 - .../migrations/0016_store_blank_string.py | 23 - .../migrations/0017_auto_20240708_1727.py | 38 - .../migrations/0018_selected_files.py | 51 - src/typesetting/migrations/__init__.py | 0 src/typesetting/models.py | 523 ------ src/typesetting/notifications/__init__.py | 0 src/typesetting/notifications/emails.py | 272 --- src/typesetting/notifications/notify.py | 132 -- src/typesetting/plugin_settings.py | 122 -- src/typesetting/security.py | 182 -- .../typesetting/assign_typesetter.html | 67 - .../breadcrumbs/typesetting_base.html | 9 - .../crossref/crossref_component.xml | 29 - .../templates/typesetting/edit_galley.html | 371 ---- .../typesetting/elements/actions.html | 28 - .../typesetting/elements/add_new_round.html | 29 - .../typesetting/elements/author_tasks.html | 3 - .../templates/typesetting/elements/card.html | 19 - .../elements/choose_supp_file.html | 30 - .../elements/complete_typesetting.html | 35 - .../typesetting/elements/dashboard.html | 34 - .../typesetting/elements/data_fig_files.html | 18 - .../typesetting/elements/file_list.html | 79 - .../typesetting/elements/galleys.html | 88 - .../elements/galleys_with_help_text.html | 5 - .../typesetting/elements/new_galley.html | 31 - .../elements/new_production_file.html | 34 - .../typesetting/elements/no_typesetter.html | 24 - .../elements/production_files.html | 47 - .../typesetting/elements/proofing.html | 31 - .../typesetting/elements/proofing_file.html | 24 - .../elements/proofreader_list.html | 31 - .../typesetting/elements/sidebar.html | 62 - .../typesetting/elements/supp_file_doi.html | 25 - .../typesetting/elements/supp_file_label.html | 19 - .../elements/supplementary_files.html | 61 - .../typesetting/elements/title_sub.html | 3 - .../typesetting/elements/transform_modal.html | 23 - .../typesetting/elements/typesetter.html | 38 - .../elements/typesetter/agreement.html | 12 - .../elements/typesetter/files.html | 40 - .../elements/typesetter/galleys.html | 61 - .../typesetting/elements/typesetter/info.html | 28 - .../elements/typesetter/metadata.html | 209 --- .../elements/typesetter/source_files.html | 31 - .../typesetter/supplementary_files.html | 25 - .../typesetting/elements/typesetter_list.html | 33 - .../typesetting_assignment_fields.html | 83 - .../elements/view_proofreading_comments.html | 23 - .../templates/typesetting/index.html | 22 - .../typesetting/notify_typesetter.html | 51 - .../typesetting/preview_embedded.html | 76 - .../typesetting/typesetting_article.html | 125 -- .../typesetting/typesetting_articles.html | 60 - .../typesetting_assign_proofreader.html | 74 - .../typesetting/typesetting_assignment.html | 143 -- .../typesetting/typesetting_assignments.html | 74 - ...ypesetting_manage_proofing_assignment.html | 183 -- .../typesetting_notify_proofreader.html | 51 - .../typesetting_proofing_assignments.html | 70 - .../typesetting_proofreading_assignment.html | 133 -- .../typesetting_review_assignment.html | 178 -- src/typesetting/templatetags/__init__.py | 0 src/typesetting/templatetags/role_count.py | 38 - .../typesetting_file_permissions.py | 11 - src/typesetting/test_galley.xml | 78 - src/typesetting/tests.py | 540 ------ src/typesetting/urls.py | 136 -- src/typesetting/views.py | 1515 ----------------- 95 files changed, 9325 deletions(-) delete mode 100644 src/typesetting/.gitignore delete mode 100644 src/typesetting/LICENSE delete mode 100644 src/typesetting/README.md delete mode 100644 src/typesetting/__init__.py delete mode 100644 src/typesetting/admin.py delete mode 100644 src/typesetting/admin_utils.py delete mode 100644 src/typesetting/forms.py delete mode 100644 src/typesetting/hooks.py delete mode 100644 src/typesetting/install/settings.json delete mode 100644 src/typesetting/logic.py delete mode 100644 src/typesetting/migrations/0001_initial.py delete mode 100644 src/typesetting/migrations/0002_typesettinground.py delete mode 100644 src/typesetting/migrations/0003_typesettingassignment.py delete mode 100644 src/typesetting/migrations/0004_auto_20200210_1412.py delete mode 100644 src/typesetting/migrations/0005_auto_20200220_1158.py delete mode 100644 src/typesetting/migrations/0006_auto_20200227_1051.py delete mode 100644 src/typesetting/migrations/0007_typesettingassignment_cancelled.py delete mode 100644 src/typesetting/migrations/0008_auto_20200316_1231.py delete mode 100644 src/typesetting/migrations/0009_typesettingcorrection.py delete mode 100644 src/typesetting/migrations/0010_auto_20200428_1701.py delete mode 100644 src/typesetting/migrations/0011_auto_20200713_1317.py delete mode 100644 src/typesetting/migrations/0012_auto_20210121_1729.py delete mode 100644 src/typesetting/migrations/0012_auto_20210126_1203.py delete mode 100644 src/typesetting/migrations/0013_merge_20210205_1049.py delete mode 100644 src/typesetting/migrations/0014_alter_galleyproofing_manager.py delete mode 100644 src/typesetting/migrations/0015_article_title_safe.py delete mode 100644 src/typesetting/migrations/0016_store_blank_string.py delete mode 100644 src/typesetting/migrations/0017_auto_20240708_1727.py delete mode 100644 src/typesetting/migrations/0018_selected_files.py delete mode 100644 src/typesetting/migrations/__init__.py delete mode 100644 src/typesetting/models.py delete mode 100644 src/typesetting/notifications/__init__.py delete mode 100644 src/typesetting/notifications/emails.py delete mode 100644 src/typesetting/notifications/notify.py delete mode 100644 src/typesetting/plugin_settings.py delete mode 100644 src/typesetting/security.py delete mode 100644 src/typesetting/templates/typesetting/assign_typesetter.html delete mode 100644 src/typesetting/templates/typesetting/breadcrumbs/typesetting_base.html delete mode 100644 src/typesetting/templates/typesetting/crossref/crossref_component.xml delete mode 100644 src/typesetting/templates/typesetting/edit_galley.html delete mode 100644 src/typesetting/templates/typesetting/elements/actions.html delete mode 100644 src/typesetting/templates/typesetting/elements/add_new_round.html delete mode 100644 src/typesetting/templates/typesetting/elements/author_tasks.html delete mode 100644 src/typesetting/templates/typesetting/elements/card.html delete mode 100644 src/typesetting/templates/typesetting/elements/choose_supp_file.html delete mode 100644 src/typesetting/templates/typesetting/elements/complete_typesetting.html delete mode 100644 src/typesetting/templates/typesetting/elements/dashboard.html delete mode 100644 src/typesetting/templates/typesetting/elements/data_fig_files.html delete mode 100644 src/typesetting/templates/typesetting/elements/file_list.html delete mode 100644 src/typesetting/templates/typesetting/elements/galleys.html delete mode 100644 src/typesetting/templates/typesetting/elements/galleys_with_help_text.html delete mode 100644 src/typesetting/templates/typesetting/elements/new_galley.html delete mode 100644 src/typesetting/templates/typesetting/elements/new_production_file.html delete mode 100644 src/typesetting/templates/typesetting/elements/no_typesetter.html delete mode 100644 src/typesetting/templates/typesetting/elements/production_files.html delete mode 100644 src/typesetting/templates/typesetting/elements/proofing.html delete mode 100644 src/typesetting/templates/typesetting/elements/proofing_file.html delete mode 100644 src/typesetting/templates/typesetting/elements/proofreader_list.html delete mode 100644 src/typesetting/templates/typesetting/elements/sidebar.html delete mode 100644 src/typesetting/templates/typesetting/elements/supp_file_doi.html delete mode 100644 src/typesetting/templates/typesetting/elements/supp_file_label.html delete mode 100644 src/typesetting/templates/typesetting/elements/supplementary_files.html delete mode 100644 src/typesetting/templates/typesetting/elements/title_sub.html delete mode 100644 src/typesetting/templates/typesetting/elements/transform_modal.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/agreement.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/files.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/galleys.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/info.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/metadata.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/source_files.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter/supplementary_files.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetter_list.html delete mode 100644 src/typesetting/templates/typesetting/elements/typesetting_assignment_fields.html delete mode 100644 src/typesetting/templates/typesetting/elements/view_proofreading_comments.html delete mode 100644 src/typesetting/templates/typesetting/index.html delete mode 100644 src/typesetting/templates/typesetting/notify_typesetter.html delete mode 100644 src/typesetting/templates/typesetting/preview_embedded.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_article.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_articles.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_assign_proofreader.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_assignment.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_assignments.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_manage_proofing_assignment.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_notify_proofreader.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_proofing_assignments.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_proofreading_assignment.html delete mode 100644 src/typesetting/templates/typesetting/typesetting_review_assignment.html delete mode 100644 src/typesetting/templatetags/__init__.py delete mode 100644 src/typesetting/templatetags/role_count.py delete mode 100644 src/typesetting/templatetags/typesetting_file_permissions.py delete mode 100644 src/typesetting/test_galley.xml delete mode 100644 src/typesetting/tests.py delete mode 100644 src/typesetting/urls.py delete mode 100644 src/typesetting/views.py diff --git a/src/typesetting/.gitignore b/src/typesetting/.gitignore deleted file mode 100644 index 7f6b81740c..0000000000 --- a/src/typesetting/.gitignore +++ /dev/null @@ -1,131 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -pip-wheel-metadata/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -.python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -.DS_Store diff --git a/src/typesetting/LICENSE b/src/typesetting/LICENSE deleted file mode 100644 index 0ad25db4bd..0000000000 --- a/src/typesetting/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/src/typesetting/README.md b/src/typesetting/README.md deleted file mode 100644 index 5c3d50efec..0000000000 --- a/src/typesetting/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# typesetting -This is a plugin for Janeway that replaces the Production and Proofing stages with an alternative process. - -## Install -1. Clone this repository into the Janeway plugins folder. -2. From the `src` directory run `python3 manage.py install_plugins typesetting`. -3. Run the Janeway command for running required migrations: `python3 manage.py migrate` -4. Restart your server (Apache, Passenger, etc) -5. You can then edit your workflow to add this plugin. diff --git a/src/typesetting/__init__.py b/src/typesetting/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/typesetting/admin.py b/src/typesetting/admin.py deleted file mode 100644 index 481bdbf21d..0000000000 --- a/src/typesetting/admin.py +++ /dev/null @@ -1,173 +0,0 @@ -__copyright__ = "Copyright 2017 Birkbeck, University of London" -__author__ = "Martin Paul Eve & Andy Byers" -__license__ = "AGPL v3" -__maintainer__ = "Birkbeck Centre for Technology and Publishing" - -from django.contrib import admin -from django.template.defaultfilters import truncatewords_html - -from plugins.typesetting import admin_utils as typesetting_admin_utils -from plugins.typesetting import models -from utils import admin_utils as utils_admin_utils - - -class TypesettingClaimAdmin(utils_admin_utils.ArticleFKModelAdmin): - list_display = ('_article', 'editor', 'claimed', '_journal') - list_filter = ('article__journal', 'claimed') - date_hierarchy = ('claimed') - search_fields = ('editor__email', 'editor__first_name', - 'editor__last_name', 'article__pk', - 'article__title') - raw_id_fields = ('article', 'editor') - - -class TypesettingRoundAdmin(utils_admin_utils.ArticleFKModelAdmin): - list_display = ('_article', '_journal', 'round_number', 'date_created') - list_filter = ('article__journal', 'round_number', 'date_created') - search_fields = ('article__pk', 'article__title') - raw_id_fields = ('article',) - date_hierarchy = ('date_created') - - inlines = [ - typesetting_admin_utils.TypesettingAssignmentInline, - typesetting_admin_utils.GalleyProofingInline, - ] - - -class TypesettingAssignmentAdmin(admin.ModelAdmin): - list_display = ( - '_article', - '_journal', - 'round', - 'typesetter', - 'manager', - 'assigned', - 'friendly_status', - ) - list_filter = ( - 'round__article__journal', - 'round__round_number', - ) - raw_id_fields = ( - 'typesetter', - 'manager', - 'round', - 'files_to_typeset', - 'galleys_created', - ) - search_fields = ( - 'round__article__pk', - 'round__article__title', - 'typesetter__email', - 'typesetter__first_name', - 'typesetter__last_name', - 'manager__email', - 'manager__first_name', - 'manager__last_name', - 'task', - 'typesetter_note', - ) - date_hierarchy = ('assigned') - - inlines = [ - typesetting_admin_utils.TypesettingCorrectionInline, - ] - - def _article(self, obj): - return truncatewords_html( - str(obj.round.article), 10 - ) if obj else '' - - def _journal(self, obj): - return obj.round.article.journal if obj else '' - - -class GalleyProofingAdmin(admin.ModelAdmin): - list_display = ( - '_article', - '_journal', - 'round', - 'proofreader', - 'manager', - 'assigned', - ) - list_filter = ( - 'round__article__journal', - 'round', - 'assigned', - ) - raw_id_fields = ( - 'proofreader', - 'manager', - 'round', - 'proofed_files', - 'annotated_files', - ) - search_fields = ( - 'round__article__pk', - 'round__article__title', - 'proofreader__email', - 'proofreader__first_name', - 'proofreader__last_name', - 'manager__email', - 'manager__first_name', - 'manager__last_name', - 'task', - 'notes', - ) - date_hierarchy = ('assigned') - - def _article(self, obj): - return truncatewords_html( - str(obj.round.article), 10 - ) if obj else '' - - def _journal(self, obj): - return obj.round.article.journal if obj else '' - - -class TypesettingCorrectionAdmin(admin.ModelAdmin): - list_display = ( - 'task', - 'galley', - 'label', - 'status', - 'date_requested', - 'date_completed', - 'date_declined', - '_journal', - ) - list_filter = ( - 'task__round__article__journal', - 'date_requested', - 'date_completed', - 'date_declined', - ) - raw_id_fields = ( - 'galley', - 'task', - ) - search_fields = ( - 'task__round__article__pk', - 'task__round__article__title', - 'task__manager__email', - 'task__manager__first_name', - 'task__manager__last_name', - 'task__typesetter__email', - 'task__typesetter__first_name', - 'task__typesetter__last_name', - ) - - def _journal(self, obj): - return obj.task.round.article.journal if obj else '' - - -admin_list = [ - (models.TypesettingClaim, TypesettingClaimAdmin), - (models.TypesettingRound, TypesettingRoundAdmin), - (models.TypesettingAssignment, TypesettingAssignmentAdmin), - (models.GalleyProofing, GalleyProofingAdmin), - (models.TypesettingCorrection, TypesettingCorrectionAdmin), -] - -[admin.site.register(*t) for t in admin_list] diff --git a/src/typesetting/admin_utils.py b/src/typesetting/admin_utils.py deleted file mode 100644 index a0e46a17b4..0000000000 --- a/src/typesetting/admin_utils.py +++ /dev/null @@ -1,33 +0,0 @@ -__copyright__ = "Copyright 2022 Birkbeck, University of London" -__author__ = "Martin Paul Eve, Andy Byers, Mauro Sanchez and Joseph Muller" -__license__ = "AGPL v3" -__maintainer__ = "Birkbeck, University of London" - -from django.contrib import admin -from plugins.typesetting import models as typesetting_models - - -class TypesettingClaimInline(admin.TabularInline): - model = typesetting_models.TypesettingClaim - extra = 0 - raw_id_fields = ('article', 'editor') - - -class TypesettingAssignmentInline(admin.TabularInline): - model = typesetting_models.TypesettingAssignment - extra = 0 - fields = ('round', 'manager', 'typesetter', 'assigned', 'due', 'task') - raw_id_fields = ('round', 'manager', 'typesetter') - - -class TypesettingCorrectionInline(admin.TabularInline): - model = typesetting_models.TypesettingCorrection - extra = 0 - raw_id_fields = ('task', 'galley') - - -class GalleyProofingInline(admin.TabularInline): - model = typesetting_models.GalleyProofing - extra = 0 - fields = ('round', 'manager', 'proofreader', 'assigned', 'due', 'task') - raw_id_fields = ('round', 'manager', 'proofreader') diff --git a/src/typesetting/forms.py b/src/typesetting/forms.py deleted file mode 100644 index a08402774c..0000000000 --- a/src/typesetting/forms.py +++ /dev/null @@ -1,300 +0,0 @@ -from django import forms -from django.db import transaction -from django.utils.translation import gettext_lazy as _ - -from core import models as core_models, forms as core_forms -from core.model_utils import JanewayBleachFormField -from plugins.typesetting import models -from utils.forms import HTMLDateInput - - -class TypesettingAssignmentForm( - forms.ModelForm, - core_forms.ConfirmableIfErrorsForm -): - - # Confirmable form modification - QUESTION = _('Are you sure you want to create a typesetting assignment?') - - def __init__(self, *args, **kwargs): - typesetters = kwargs.pop('typesetters') - files = kwargs.pop('files') - galleys = kwargs.pop('galleys', ()) - initial_galleys_to_correct = kwargs.pop('initial_galleys_to_correct', ()) - self.rounds = kwargs.pop('rounds') - super().__init__(*args, **kwargs) - - self.fields['typesetter'].queryset = typesetters - self.fields['files_to_typeset'].queryset = files - self.fields['galleys_to_correct'] = forms.MultipleChoiceField( - widget=forms.CheckboxSelectMultiple(), - required=False, - choices=[(g.pk, g.detail()) for g in galleys], - initial=initial_galleys_to_correct, - ) - - class Meta: - model = models.TypesettingAssignment - fields = ( - 'typesetter', - 'due', - 'task', - 'files_to_typeset', - 'display_proof_comments', - ) - - widgets = { - 'due': HTMLDateInput(), - } - - def save(self, commit=True): - assignment = super().save(commit=False) - assignment.round = self.rounds[0] - - if commit: - with transaction.atomic(): - assignment.save() - - for file in assignment.files_to_typeset.all(): - assignment.files_to_typeset.remove(file) - for file in self.cleaned_data.get('files_to_typeset', ()): - assignment.files_to_typeset.add(file) - - galleys_to_correct = self.cleaned_data.get('galleys_to_correct', ()) - for correction in assignment.corrections.all(): - if correction.galley.pk not in galleys_to_correct: - correction.delete() - for galley_id in galleys_to_correct: - galley = core_models.Galley.objects.get(pk=galley_id) - assignment.corrections.get_or_create( - task=assignment, - galley=galley, - label=galley.label, - ) - - return assignment - - def check_for_potential_errors(self): - # Confirmable form modification - potential_errors = [] - - typesetter = self.cleaned_data.get('typesetter', None) - message = self.check_for_inactive_account(typesetter) - if message: - potential_errors.append(message) - - files_to_typeset = self.cleaned_data.get('files_to_typeset', ()) - if not files_to_typeset: - message = "No files were selected for typesetting. The typesetter " \ - "may not have access to the right files." - potential_errors.append(message) - - galleys_to_correct = self.cleaned_data.get('galleys_to_correct', ()) - if not galleys_to_correct and self.rounds.first().article.galley_set.exists(): - message = "No galleys were marked for correction." - potential_errors.append(message) - - for galley_id in galleys_to_correct: - try: - galley = core_models.Galley.objects.get(pk=galley_id) - if galley.file not in files_to_typeset: - message = f"The galley with a label of {galley.label} " \ - f"was selected for correction, but the typesetter " \ - f"was not given access to the linked " \ - f"file: {galley.file.pk} - {galley.file.original_filename}." - potential_errors.append(message) - except core_models.Galley.DoesNotExist: - pass - - return potential_errors - - def last_typesetter(self): - if len(self.rounds) > 1: - return self.rounds[1].typesettingassignment.typesetter - else: - return None - - -class EditTypesettingAssignmentForm(TypesettingAssignmentForm): - QUESTION = _('Are you sure you want to save the typesetting assignment?') - CONFIRMABLE_BUTTON_NAME = 'edit_confirmable' - CONFIRMED_BUTTON_NAME = 'edit_confirmed' - - -class AssignProofreader(forms.ModelForm, core_forms.ConfirmableIfErrorsForm): - - # Confirmable form modification - QUESTION = _('Are you sure you want to create a proofreading assignment?') - - def __init__(self, *args, **kwargs): - self.proofreaders = kwargs.pop('proofreaders') - self.round = kwargs.pop('round') - self.manager = kwargs.pop('user') - super(AssignProofreader, self).__init__(*args, **kwargs) - - self.fields['proofreader'].queryset = self.proofreaders - - class Meta: - model = models.GalleyProofing - fields = ('proofreader', 'task', 'due',) - - widgets = { - 'due': HTMLDateInput(), - } - - def save(self, commit=True): - assignment = super(AssignProofreader, self).save(commit=False) - assignment.round = self.round - assignment.manager = self.manager - - if commit: - assignment.save() - - return assignment - - def check_for_potential_errors(self): - # Confirmable form modification - potential_errors = [] - - proofreader = self.cleaned_data.get('proofreader', None) - message = self.check_for_inactive_account(proofreader) - if message: - potential_errors.append(message) - - return potential_errors - - -def decision_choices(): - return ( - ('accept', 'Accept'), - ('decline', 'Decline'), - ) - - -class TypesetterDecision(forms.Form): - decision = forms.ChoiceField(choices=decision_choices(), required=True) - note = JanewayBleachFormField(required=False) - - -class ManagerDecision(forms.ModelForm): - - class Meta: - model = models.TypesettingAssignment - fields = ('review_decision',) - - def save(self, commit=True): - decision = super(ManagerDecision, self).save(commit=False) - decision.reviewed = True - if commit: - decision.save() - - return decision - - -class SupplementaryFileChoiceForm(forms.ModelForm): - label = forms.CharField( - required=False, - help_text=_("Text to show as the download link on the article page") - ) - - def __init__(self, *args, **kwargs): - self.article = kwargs.pop('article') - super().__init__(*args, **kwargs) - files = core_models.File.objects.filter( - article_id=self.article.pk, - ).exclude( - supplementaryfile__file__article_id = self.article.pk, - ) - self.fields['file'].queryset = files - - class Meta: - model = core_models.SupplementaryFile - fields = ('file',) - - def save(self, commit=True): - instance = super().save(commit=commit) - if commit: - if self.cleaned_data.get("label"): - instance.file.label = self.cleaned_data["label"] - instance.file.save() - self.article.supplementary_files.add(instance) - return instance - - -class EditProofingAssignment(forms.ModelForm): - class Meta: - model = models.GalleyProofing - fields = ('task', 'due',) - widgets = { - 'due': HTMLDateInput(), - } - - -class ProofingForm(forms.ModelForm, core_forms.ConfirmableForm): - - # Confirmable form constants - QUESTION = _('Are you sure you want to complete the proofreading task?') - - class Meta: - model = models.GalleyProofing - fields = ('notes',) - summernote_attrs = { - 'disable_attachment': True, - 'height': '500px', - } - - def check_for_potential_errors(self): - # This customizes the confirmable form method - potential_errors = [] - - # Check for unproofed galleys - galleys = core_models.Galley.objects.filter( - article=self.instance.round.article, - ) - unproofed_galleys = self.instance.unproofed_galleys(galleys) - if unproofed_galleys: - message = _('You have not proofed some galleys:')+' {}.'.format( - ", ".join([g.label for g in unproofed_galleys]) - ) - potential_errors.append(message) - - # Check if a note was added - if not self.cleaned_data.get('notes', None): - message = 'The Notes field is empty.' - potential_errors.append(_(message)) - - # Check if new files were added - annotated_files = self.instance.annotated_files.all() - if annotated_files: - last_upload = max(set(an_file.date_uploaded for an_file in annotated_files)) - last_editor_or_typesetter_action = max(filter(bool, [ - self.instance.completed, - self.instance.assigned, - ])) - if last_editor_or_typesetter_action > last_upload: - message = 'The annotated files have not been changed.' - potential_errors.append(_(message)) - else: - message = 'No annotated files have been uploaded.' - potential_errors.append(_(message)) - - return potential_errors - - -class GalleyForm(forms.ModelForm): - file = forms.FileField() - - class Meta: - model = core_models.Galley - fields = ( - 'label', - 'public', - ) - - def __init__(self, *args, **kwargs): - include_file = kwargs.pop('include_file', True) - super().__init__(*args, **kwargs) - self.fields['label'].required = False - - if not include_file: - self.fields.pop('file') diff --git a/src/typesetting/hooks.py b/src/typesetting/hooks.py deleted file mode 100644 index 3247e4a899..0000000000 --- a/src/typesetting/hooks.py +++ /dev/null @@ -1,28 +0,0 @@ -from django.template.loader import render_to_string - -from plugins.typesetting import models - - -def author_tasks(context): - request = context['request'] - article = context['article'] - - author_proofing_tasks = models.GalleyProofing.objects.filter( - round__article=article, - round__article__authors=request.user, - proofreader=request.user, - completed__isnull=True, - cancelled=False, - ) - - if author_proofing_tasks.exists(): - - return render_to_string( - 'typesetting/elements/author_tasks.html', - { - 'article': article, - 'author_proofing_tasks': author_proofing_tasks, - }, - ) - - return '' diff --git a/src/typesetting/install/settings.json b/src/typesetting/install/settings.json deleted file mode 100644 index fdae78079f..0000000000 --- a/src/typesetting/install/settings.json +++ /dev/null @@ -1,371 +0,0 @@ -[ - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Typesetter on task assignment.", - "is_translatable": true, - "name": "typesetting_notify_typesetter", - "pretty_name": "Typesetter Assignment Notification (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{ assignment.typesetter.full_name }},

This is a notification from {{ request.user.full_name }} that you have been assigned to the production of article {{ assignment.round.article.safe_title }} on journal {{ request.journal.name }}.

You can view further information on this assignment: {{ typesetting_assignments_url }}.

Regards,

{{ request.user.signature|safe }}

" - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetter Assignment Notification.", - "is_translatable": true, - "name": "subject_typesetting_notify_typesetter", - "pretty_name": "Subject for Typesetter Assignment Notification (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment" - } - }, - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to typesetting manager when a typesetter accepts a task.", - "is_translatable": true, - "name": "typsetting_typesetter_decision_accept", - "pretty_name": "Typesetter Accept (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{ assignment.manager.full_name }},

This is to notify you that {{ assignment.typesetter.full_name }} has accepted your assignment your assignment for {{ assignment.round.article.title|safe }}.

{% if note %}

They provided the following note:
{{ note|safe }}

{% endif %}

Regards,

" - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetter Accept", - "is_translatable": true, - "name": "subject_typsetting_typesetter_decision_accept", - "pretty_name": "Subject for Typesetter Accept (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment Accepted" - } - }, - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to typesetting manager when a typesetter declines a task.", - "is_translatable": true, - "name": "typsetting_typesetter_decision_decline", - "pretty_name": "Typesetter Decline (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{ assignment.manager.full_name }},

This is to notify you that {{ assignment.typesetter.full_name }} has declined your assignment for {{ assignment.round.article.title|safe }}.

{% if note %}

They provided the following note:
{{ note|safe }}

{% endif %}

Regards,

" - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetter Decline", - "is_translatable": true, - "name": "subject_typsetting_typesetter_decision_decline", - "pretty_name": "Subject for Typesetter Decline (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment Declined" - } - }, - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to typesetting manager when a typesetter completes a task.", - "is_translatable": true, - "name": "typesetting_typesetter_complete", - "pretty_name": "Typesetter Complete (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{ assignment.manager.full_name }},

This is to notify you that {{ assignment.typesetter.full_name }} has completed your assignment for {{ assignment.round.article.title|safe }}.

{% if note %}

They provided the following note:
{{ assignment.typesetter_note|safe }}

{% endif %}

Visit the article URL for more details: {{ typesetting_article_url }}

Regards,

" - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetter Complete (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_typesetter_complete", - "pretty_name": "Subject for Typesetter Complete (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment Complete" - } - }, - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Proofreaders on task assignment.", - "is_translatable": true, - "name": "typesetting_notify_proofreader", - "pretty_name": "Proofreader Assignment Notification (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{ assignment.proofreader.full_name }},

This is an notification from {{ request.user.full_name }} that you have been assigned to proofread {{ assignment.round.article.safe_title }} on journal {{ request.journal.name }}.

You can view further information on this assignment: {{ typesetting_assignments_url }}.

Regards,

{{ request.user.signature|safe }}

" - - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Proofreader Assignment Notification", - "is_translatable": true, - "name": "subject_typesetting_notify_proofreader", - "pretty_name": "Subject for Proofreader Assignment Notification (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Proofreading Assignment" - } - }, - { - "group": { - "name": "general" - }, - "setting": { - "description": "Proofreader guidelines", - "is_translatable": true, - "name": "typesetting_proofreader_guidelines", - "pretty_name": "Proofreader Guide (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

The files below have been assigned to you for proofreading. You must check all files before you can mark this task as complete, including both the PDF and XML proofs (XML is the web display version of the article).

After downloading the files, you can then upload these with any annotations or corrections marked directly on the proofs. If needed, you can also add additional notes to the typesetter in the text box below.

Please note that proofreading comments will go back to a typesetter, and so should give concise and clear instructions on any minor corrections needed (do not include questions or optional requests – if you are unsure on something, discuss it with the assigning editor first).

" - } - }, - { - "value": {"default": "Production Complete"}, - "setting": { - "type": "char", - "pretty_name": "Production Complete", - "is_translatable": true, - "description": "Subject for Email sent to Editors when Production is Complete.", - "name": "subject_production_complete" - }, - "group": { - "name": "email_subject" - } - }, - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Editors when Typesetting is Complete. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_complete", - "pretty_name": "Typesetting Complete (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear editors,

This is an automatic notification to inform you that Typesetting is complete for article \"{{ article.safe_title}}\".

Regards,

{{ request.user.signature|safe }}

" - } - }, - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetting Complete (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_complete", - "pretty_name": "Subject for Typesetting Complete (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Complete" - } - }, - - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Editors when a Proofreading Assignment is Complete. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_proofreader_completed", - "pretty_name": "Proofreading Complete (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{assignment.manager.full_name}},

This is a notification to let you know that the proofing you requested for the article {{assignment.round.article.safe_title}}, with article number {{assignment.round.article.pk}}, has now been completed by {{assignment.proofreader.full_name}}.

Best wishes,

" - } - }, - - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Proofreading Complete (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_proofreader_completed", - "pretty_name": "Subject for Proofreading Complete (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Proofreading Assignment Complete" - } - }, - - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Proofreaders when a Proofreading Assignment is Cancelled. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_proofreader_cancelled", - "pretty_name": "Proofreading Cancelled (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your proofreading request for the article {{assignment.round.article.safe_title}}, with article number {{assignment.round.article.pk}} has been cancelled. This means that you no longer need to complete this proofreading task

Best wishes,

{{ assignment.manager.signature|safe }}

" - } - }, - - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Proofreading Cancelled (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_proofreader_cancelled", - "pretty_name": "Subject for Proofreading Cancelled (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Proofreading Assignment Cancelled" - } - }, - - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Proofreaders when a Proofreading Assignment is Reset. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_proofreader_reset", - "pretty_name": "Proofreading Reset (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your proofreading request for the article {{assignment.round.article.safe_title}}, with article number {{assignment.round.article.pk}}, has been reopened. Please log in to the journal using this link in order to complete this proofreading request: {{ typesetting_proofreading_assignments }}.

Thank you for your help,

Best wishes,

{{ assignment.manager.signature|safe }}

" - } - }, - - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Proofreading Reset (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_proofreader_reset", - "pretty_name": "Subject for Proofreading Reset (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Proofreading Assignment Reopened" - } - }, - - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Typesetters when a Typesetting Assignment is Cancelled. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_typesetter_cancelled", - "pretty_name": "Typesetting Cancelled (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your typesetting request for the article {{assignment.round.article.safe_title}}, with article number {{assignment.round.article.pk}}, has been cancelled. This means that you no longer need to complete this task.

Thank you for your help,

{{ assignment.manager.signature|safe }}

" - } - }, - - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetting Cancelled (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_typesetter_cancelled", - "pretty_name": "Subject for Typesetting Cancelled (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment Cancelled" - } - }, - - { - "group": { - "name": "email" - }, - "setting": { - "description": "Email sent to Typesetters when a Typesetting Assignment is Deleted. Used by the typesetting plugin", - "is_translatable": true, - "name": "typesetting_typesetter_deleted", - "pretty_name": "Typesetting Deleted (PLUGIN)", - "type": "rich-text" - }, - "value": { - "default": "

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your typesetting request for the article {{assignment.round.article.safe_title}}, with article number {{assignment.round.article.pk}}, has been deleted. This means that you no longer need to complete this task.

Thank you for your help,

{{ assignment.manager.signature|safe }}

" - } - }, - - { - "group": { - "name": "email_subject" - }, - "setting": { - "description": "Subject for Typesetting Deleted (PLUGIN)", - "is_translatable": true, - "name": "subject_typesetting_typesetter_deleted", - "pretty_name": "Subject for Typesetting Deleted (PLUGIN)", - "type": "char" - }, - "value": { - "default": "Typesetting Assignment Cancelled" - } - } -] diff --git a/src/typesetting/logic.py b/src/typesetting/logic.py deleted file mode 100644 index 9248dc1239..0000000000 --- a/src/typesetting/logic.py +++ /dev/null @@ -1,342 +0,0 @@ -import time -import uuid -import datetime - -from django.db import transaction -from django.db.models import Q, ExpressionWrapper, BooleanField -from django.shortcuts import redirect, reverse -from django.utils.translation import gettext_lazy as _ -from django.contrib import messages -from django.core.exceptions import ValidationError -from django.template.loader import render_to_string - -from core import models as core_models, files -from events import logic as event_logic -from identifiers import logic as ident_logic -from identifiers.models import DOI_RE -from production import logic -from utils import setting_handler, render_template - -from plugins.typesetting import models, plugin_settings -from plugins.typesetting.notifications import notify - - -def production_ready_files(article, file_objects=False): - """ - Deprecated. - Gathers a list of production ready files. - :param article: an Article object - :param file_objects: Boolean - :return: a list of File type objects - """ - raise DeprecationWarning('Use get_typesetting_files instead.') - submitted_ms_files = article.manuscript_files.filter(is_galley=False) - copyeditted_files = logic.get_copyedit_files(article) - - if file_objects: - file_pks = list() - - for file in submitted_ms_files: - file_pks.append(file.pk) - - for file in copyeditted_files: - file_pks.append(file.pk) - - return core_models.File.objects.filter(pk__in=file_pks) - - else: - - return { - 'Manuscript File': submitted_ms_files, - 'Copyedited File': copyeditted_files, - } - - -def get_typesetting_files(article, previous_round=None): - """ - Gets queryset of files that may be needed during typesetting. - File objects will be pre-checked for the user as a convenience - if they are galleys or if they are proofing files from - the previous round. - :param article: an Article object - :param previous_round: TypesettingRound - """ - query = Q(manuscript_files=article) - query |= Q(data_figure_files=article) - query |= Q(copyeditor_files__article=article) - query |= Q(galley__article=article) - query |= Q(supplementaryfile__supp=article) - query |= Q(galleyproofing__round__article=article) - queryset = core_models.File.objects - - # Pre-check files that are likely to be needed - checked_query = Q() - checked_query |= Q(galley__article=article) - checked_query |= Q(data_figure_files=article) - if previous_round: - checked_query |= Q( - galleyproofing__round__article=article, - galleyproofing__round=previous_round, - galleyproofing__completed__isnull=False, - ) - - queryset = queryset.annotate( - checked=ExpressionWrapper( - checked_query, - output_field=BooleanField() - ) - ) - return queryset.filter(query).order_by('-last_modified') - - -def get_typesetters(journal): - typesetter_pks = [ - role.user.pk for role in core_models.AccountRole.objects.filter( - role__slug='typesetter', - journal=journal, - ) - ] - - return core_models.Account.objects.filter(pk__in=typesetter_pks) - - -def get_proofreaders(article, round, assignment=None): - pks = list() - current_proofer_pks = [ - p.proofreader.pk for p in round.galleyproofing_set.all() - ] - - for editor in article.editor_list(): - pks.append(editor.pk) - - for author in article.authors.all(): - pks.append(author.pk) - - for proofreader in core_models.AccountRole.objects.filter( - role__slug='proofreader', - journal=article.journal - ): - pks.append(proofreader.user.pk) - - # If fetching for an assignment we want that user to remain in the list - if assignment and assignment.proofreader.pk in pks: - current_proofer_pks.remove(assignment.proofreader.pk) - - return core_models.Account.objects.filter( - pk__in=pks, - ).exclude( - pk__in=current_proofer_pks, - ) - - -def get_typesetter_notification(assignment, article, request): - url = request.journal.site_url(reverse("typesetting_assignments")) - context = { - 'article': article, - 'assignment': assignment, - 'typesetting_assignments_url': url, - } - return render_template.get_message_content( - request, - context, - 'typesetting_notify_typesetter', - ) - - -def get_proofreader_notification(assignment, article, request): - url = request.journal.site_url( - reverse("typesetting_proofreading_assignments")) - context = { - 'article': article, - 'assignment': assignment, - 'typesetting_assignments_url': url, - } - return render_template.get_message_content( - request, - context, - 'typesetting_notify_proofreader', - ) - - -def handle_proofreader_file(request, assignment, article): - uploaded_files = request.FILES.getlist('file') - - if uploaded_files: - for file in uploaded_files: - new_file = files.save_file_to_article( - file, - article, - request.user, - ) - new_file.label = 'Proofing File' - new_file.save() - assignment.annotated_files.add(new_file) - messages.add_message( - request, - messages.SUCCESS, - 'Annotated file uploaded. ' - 'When you are done use the "Mark Task as Complete" button to finish proofreading.', - ) - - -def new_typesetting_round(article, rounds, request): - if not rounds: - new_round = models.TypesettingRound.objects.create( - article=article, - ) - else: - latest_round = rounds[0] - latest_round.close(request.user) - - if hasattr(latest_round, 'typesettingassignment'): - notify.event_typesetting_cancelled( - latest_round.typesettingassignment, - request, - ) - - new_round = models.TypesettingRound.objects.create( - article=article, - round_number=latest_round.round_number + 1, - ) - - return new_round - - -MISSING_GALLEYS = _("Article has no typeset files") -MISSING_IMAGES = _("One or more typeset files are missing images") -OPEN_TASKS = _( - "One or more typesetting or proofing tasks haven't been completed" -) - - -def typesetting_pending_tasks(round): - pending_tasks = [] - galleys = round.article.galley_set.all() - if not galleys: - pending_tasks.append(MISSING_GALLEYS) - else: - for galley in galleys: - if galley.has_missing_image_files(): - pending_tasks.append(MISSING_IMAGES) - break - - if round.has_open_tasks: - pending_tasks.append(OPEN_TASKS) - - return pending_tasks - - -@transaction.atomic -def complete_typesetting(request, article): - kwargs = { - 'request': request, - 'article': article, - } - - event_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_COMPLETE, - task_object=article, **kwargs - ) - if request.journal.element_in_workflow(element_name='Typesetting Plugin'): - workflow_kwargs = { - 'handshake_url': 'typesetting_articles', - 'request': request, - 'article': article, - 'switch_stage': True, - } - - return event_logic.Events.raise_event( - event_logic.Events.ON_WORKFLOW_ELEMENT_COMPLETE, - task_object=article, - **workflow_kwargs) - else: - messages.add_message( - request, - messages.WARNING, - 'There was an error moving this article to the next stage.' - ) - return redirect( - reverse('core_dashboard') - ) - - -def get_next_element(handshake_url, request): - workflow = core_models.Workflow.objects.get(journal=request.journal) - workflow_elements = workflow.elements.all() - - current_element = workflow.elements.get(handshake_url=handshake_url) - - try: - index = list(workflow_elements).index(current_element) + 1 - return workflow_elements[index] - except IndexError: - # An index error will occur here when the workflow is complete - return None - - -def mint_supp_file_doi(supp_file, doi=None): - article = supp_file.file.article - article_doi = article.get_doi() - if not article_doi: - raise RuntimeError( - "Can't issue doi for supp file %s: Article %s has no doi" - "" % (supp_file.pk, article.pk) - ) - - if not doi and supp_file.doi: - doi = supp_file.doi - elif not doi: - doi = "%s.s%s" % (article_doi, supp_file.pk) - - xml_context = { - 'supp_file': supp_file, - 'article': article, - 'batch_id': uuid.uuid4(), - 'timestamp': int(time.time()), - 'depositor_name': setting_handler.get_setting( - 'Identifiers', 'crossref_name', article.journal, - ).processed_value, - 'depositor_email': setting_handler.get_setting( - 'Identifiers', 'crossref_email', article.journal, - ).processed_value, - 'registrant': setting_handler.get_setting( - 'Identifiers', 'crossref_registrant', article.journal, - ).processed_value, - 'timestamp_suffix': setting_handler.get_setting( - 'crossref', 'crossref_date_suffix', article.journal, - ).processed_value, - 'parent_doi': article_doi, - 'doi': doi, - 'now': datetime.datetime.now(), - } - xml_content = render_to_string( - 'typesetting/crossref/crossref_component.xml', - xml_context, - ) - ident_logic.register_crossref_component(article, xml_content, supp_file) - - supp_file.doi = doi - supp_file.save() - - return doi - - -def validate_supp_file_doi(supp_file, doi): - journal = supp_file.file.article.journal - try: - submitted_prefix = doi.split("/")[0] - except (TypeError, ValueError): - raise ValidationError("'%s' is not a valid DOI" % doi) - - if not DOI_RE.match(doi): - raise ValidationError("'%s' is not a valid DOI" % doi) - - prefix = setting_handler.get_setting( - 'Identifiers', 'crossref_prefix', journal, - ).processed_value - if prefix != submitted_prefix: - raise ValidationError( - "'%s' doesn't match the configured prefix '%s'" % (doi, prefix) - ) - - return True diff --git a/src/typesetting/migrations/0001_initial.py b/src/typesetting/migrations/0001_initial.py deleted file mode 100644 index a0a4026680..0000000000 --- a/src/typesetting/migrations/0001_initial.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2020-02-03 13:41 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='TypesettingClaim', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('claimed', models.DateTimeField(default=django.utils.timezone.now)), - ('article', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='submission.Article')), - ('editor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.AlterUniqueTogether( - name='typesettingclaim', - unique_together=set([('editor', 'article')]), - ), - ] diff --git a/src/typesetting/migrations/0002_typesettinground.py b/src/typesetting/migrations/0002_typesettinground.py deleted file mode 100644 index 07d8cc5c62..0000000000 --- a/src/typesetting/migrations/0002_typesettinground.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2020-02-03 15:47 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('submission', '0040_article_projected_issue'), - ('typesetting', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='TypesettingRound', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('round_number', models.PositiveIntegerField(default=1)), - ('date_created', models.DateTimeField(auto_now_add=True)), - ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submission.Article')), - ], - options={ - 'ordering': ('-round_number',), - }, - ), - ] diff --git a/src/typesetting/migrations/0003_typesettingassignment.py b/src/typesetting/migrations/0003_typesettingassignment.py deleted file mode 100644 index 491b66088d..0000000000 --- a/src/typesetting/migrations/0003_typesettingassignment.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2020-02-07 11:56 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0033_set_default_xml_galley_xsl'), - ('typesetting', '0002_typesettinground'), - ] - - operations = [ - migrations.CreateModel( - name='TypesettingAssignment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('assigned', models.DateTimeField(default=django.utils.timezone.now)), - ('notified', models.BooleanField(default=False)), - ('accepted', models.DateTimeField(blank=True, null=True)), - ('due', models.DateField(null=True)), - ('completed', models.DateTimeField(blank=True, null=True)), - ('reviewed', models.BooleanField(default=False)), - ('review_decision', models.CharField(choices=[('accept', 'Accept'), ('corrections', 'Corrections Required'), ('proofing', 'Proofing Required')], max_length=21)), - ('task', models.TextField(null=True, verbose_name='Typesetting Task')), - ('typesetter_note', models.TextField(blank=True, verbose_name='Note to Editor')), - ('files_to_typeset', models.ManyToManyField(blank=True, related_name='files_to_typeset', to='core.File')), - ('galleys_created', models.ManyToManyField(blank=True, to='core.Galley')), - ('manager', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='manager', to=settings.AUTH_USER_MODEL)), - ('round', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='typesetting.TypesettingRound')), - ('typesetter', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='typesetter', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/src/typesetting/migrations/0004_auto_20200210_1412.py b/src/typesetting/migrations/0004_auto_20200210_1412.py deleted file mode 100644 index a62c67688b..0000000000 --- a/src/typesetting/migrations/0004_auto_20200210_1412.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.23 on 2020-02-10 14:12 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0003_typesettingassignment'), - ] - - operations = [ - migrations.AlterField( - model_name='typesettingassignment', - name='round', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='typesetting.TypesettingRound'), - ), - ] diff --git a/src/typesetting/migrations/0005_auto_20200220_1158.py b/src/typesetting/migrations/0005_auto_20200220_1158.py deleted file mode 100644 index 4b1c5869c3..0000000000 --- a/src/typesetting/migrations/0005_auto_20200220_1158.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-02-20 11:58 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0033_set_default_xml_galley_xsl'), - ('typesetting', '0004_auto_20200210_1412'), - ] - - operations = [ - migrations.CreateModel( - name='GalleyProofing', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('assigned', models.DateTimeField(default=django.utils.timezone.now)), - ('notified', models.BooleanField(default=False)), - ('due', models.DateTimeField(default=None, verbose_name='Date Due')), - ('accepted', models.DateTimeField(blank=True, null=True)), - ('completed', models.DateTimeField(blank=True, null=True)), - ('cancelled', models.BooleanField(default=False)), - ('task', models.TextField(verbose_name='Proofing Task')), - ('notes', models.TextField()), - ('annotated_files', models.ManyToManyField(to='core.File')), - ('manager', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='galley_manager', to=settings.AUTH_USER_MODEL)), - ('proofed_files', models.ManyToManyField(to='core.Galley')), - ('proofreader', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), - ('round', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='typesetting.TypesettingRound')), - ], - ), - migrations.AlterField( - model_name='typesettingassignment', - name='review_decision', - field=models.CharField(blank=True, choices=[('accept', 'Accept'), ('corrections', 'Corrections Required'), ('proofing', 'Proofing Required')], max_length=21), - ), - migrations.AlterField( - model_name='typesettingassignment', - name='task', - field=models.TextField(help_text='Please let the typesetter know what you want them to create and if there are any special circumstances. They will have access to the articles metadata.', null=True, verbose_name='Typesetting Task'), - ), - ] diff --git a/src/typesetting/migrations/0006_auto_20200227_1051.py b/src/typesetting/migrations/0006_auto_20200227_1051.py deleted file mode 100644 index f64498acca..0000000000 --- a/src/typesetting/migrations/0006_auto_20200227_1051.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-02-27 10:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('submission', '0040_article_projected_issue'), - ('typesetting', '0005_auto_20200220_1158'), - ] - - operations = [ - migrations.AlterModelOptions( - name='typesettinground', - options={'ordering': ('-round_number', 'date_created')}, - ), - migrations.AlterField( - model_name='galleyproofing', - name='task', - field=models.TextField(help_text='If there is any additional information or direction you can give the proofreader to complete their task you can add it here.', verbose_name='Proofing Task'), - ), - migrations.AlterUniqueTogether( - name='typesettinground', - unique_together=set([('round_number', 'article')]), - ), - ] diff --git a/src/typesetting/migrations/0007_typesettingassignment_cancelled.py b/src/typesetting/migrations/0007_typesettingassignment_cancelled.py deleted file mode 100644 index 6655a2b740..0000000000 --- a/src/typesetting/migrations/0007_typesettingassignment_cancelled.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.28 on 2020-03-16 11:24 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0006_auto_20200227_1051'), - ] - - operations = [ - migrations.AddField( - model_name='typesettingassignment', - name='cancelled', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/src/typesetting/migrations/0008_auto_20200316_1231.py b/src/typesetting/migrations/0008_auto_20200316_1231.py deleted file mode 100644 index 952aea281c..0000000000 --- a/src/typesetting/migrations/0008_auto_20200316_1231.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.28 on 2020-03-16 12:31 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0007_typesettingassignment_cancelled'), - ] - - operations = [ - migrations.AlterModelOptions( - name='galleyproofing', - options={'ordering': ('assigned', 'accepted', 'pk')}, - ), - migrations.AlterField( - model_name='galleyproofing', - name='annotated_files', - field=models.ManyToManyField(blank=True, to='core.File'), - ), - migrations.AlterField( - model_name='galleyproofing', - name='notes', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='galleyproofing', - name='proofed_files', - field=models.ManyToManyField(blank=True, to='core.Galley'), - ), - ] diff --git a/src/typesetting/migrations/0009_typesettingcorrection.py b/src/typesetting/migrations/0009_typesettingcorrection.py deleted file mode 100644 index 29108c5ab0..0000000000 --- a/src/typesetting/migrations/0009_typesettingcorrection.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-04-16 11:39 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0033_set_default_xml_galley_xsl'), - ('typesetting', '0008_auto_20200316_1231'), - ] - - operations = [ - migrations.CreateModel( - name='TypesettingCorrection', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date_requested', models.DateTimeField(auto_now_add=True)), - ('date_completed', models.DateTimeField(blank=True, null=True)), - ('date_declined', models.DateTimeField(blank=True, null=True)), - ('file_checksum', models.CharField(blank=True, max_length=255, null=True)), - ('galley', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.Galley')), - ('task', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='corrections', to='typesetting.TypesettingAssignment')), - ], - ), - ] diff --git a/src/typesetting/migrations/0010_auto_20200428_1701.py b/src/typesetting/migrations/0010_auto_20200428_1701.py deleted file mode 100644 index 88a468c90b..0000000000 --- a/src/typesetting/migrations/0010_auto_20200428_1701.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.28 on 2020-04-28 16:01 -from __future__ import unicode_literals - -from django.db import migrations - -updates = [ - {'from': 'typesetting_article', 'to': 'typesetting_articles'}, -] - -def update_handshake_urls(apps, schema_editor): - WorkflowElement = apps.get_model("core", "WorkflowElement") - - for update in updates: - elements_to_update = WorkflowElement.objects.filter( - handshake_url=update.get('from') - ) - for element_to_update in elements_to_update: - element_to_update.handshake_url = update.get('to') - element_to_update.save() - - -def reverse_handshake_urls(apps, schema_editor): - WorkflowElement = apps.get_model("core", "WorkflowElement") - - for update in updates: - elements_to_update = WorkflowElement.objects.filter( - handshake_url=update.get('to') - ) - for element_to_update in elements_to_update: - element_to_update.handshake_url = update.get('from') - element_to_update.save() - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0009_typesettingcorrection'), - ] - - operations = [ - migrations.RunPython( - update_handshake_urls, - reverse_code=reverse_handshake_urls, - ), - ] diff --git a/src/typesetting/migrations/0011_auto_20200713_1317.py b/src/typesetting/migrations/0011_auto_20200713_1317.py deleted file mode 100644 index f665fffb73..0000000000 --- a/src/typesetting/migrations/0011_auto_20200713_1317.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2020-07-13 13:17 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0010_auto_20200428_1701'), - ] - - operations = [ - migrations.AlterField( - model_name='galleyproofing', - name='task', - field=models.TextField(help_text='Add any additional information or instructions for the proofreader here.', verbose_name='Proofing Task'), - ), - ] diff --git a/src/typesetting/migrations/0012_auto_20210121_1729.py b/src/typesetting/migrations/0012_auto_20210121_1729.py deleted file mode 100644 index fde3495cf2..0000000000 --- a/src/typesetting/migrations/0012_auto_20210121_1729.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2021-01-21 17:29 -from __future__ import unicode_literals - -from django.db import migrations -from django.core.exceptions import FieldError - -NEW_TASK_COMPLETE = "

Dear {{ assignment.manager.full_name }},

This is to notify you that {{ assignment.typesetter.full_name }} has completed your assignment for {{ assignment.round.article.title|safe }}.

{% if note %}

They provided the following note:
{{ assignment.typesetter_note|safe }}

{% endif %}

Visit the article URL for more details: {{ typesetting_article_url }}

Regards,

" -OLD_TASK_COMPLETE = "

Dear {{ assignment.manager.full_name }},

This is to notify you that {{ assignment.typesetter.full_name }} has completed your assignment for {{ assignment.round.article.title|safe }}.

{% if note %}

They provided the following note:
{{ assignment.typesetter_note|safe }}

{% endif %}

Regards,

" -OLD_COMPLETE = "

Dear editors,

This is an automatic notification to inform you that Typesetting is complete for article \"{{ article.title}}\".

This article is now in the Proofing workflow: {{ proofing_list_url }}.

Regards,

{{ request.user.signature|safe }}

" -NEW_COMPLETE = "

Dear editors,

This is an automatic notification to inform you that Typesetting is complete for article \"{{ article.title}}\".

Regards,

{{ request.user.signature|safe }}

" - - -def update_setting_values(apps, schema_editor): - try: - SettingValueTranslation = apps.get_model('core', 'SettingValueTranslation') - queryset = SettingValueTranslation.objects.filter(master__setting__name=('typesetting_typesetter_complete')) - replace_value(queryset, old=OLD_TASK_COMPLETE, new=NEW_TASK_COMPLETE) - queryset = SettingValueTranslation.objects.filter(master__setting__name=('typesetting_complete')) - replace_value(queryset, old=OLD_COMPLETE, new=NEW_COMPLETE) - except (LookupError, FieldError): - pass # this migration is not required as the tree does not build the master field. - - -def replace_value(qs, old, new): - for setting in qs: - if setting.value == old: - setting.value = new - setting.save() - - -def reverse_code(apps, schema_editor): - try: - SettingValueTranslation = apps.get_model('core', 'SettingValueTranslation') - queryset = SettingValueTranslation.objects.filter(master__setting__name=('typesetting_typesetter_complete')) - replace_value(queryset, old=NEW_TASK_COMPLETE, new=OLD_TASK_COMPLETE) - queryset = SettingValueTranslation.objects.filter(master__setting__name=('typesetting_complete')) - replace_value(queryset, old=NEW_COMPLETE, new=OLD_COMPLETE) - except (LookupError, FieldError): - pass # If no SettingValueTranslation model is found we don't need to run this. - - -class Migration(migrations.Migration): - dependencies = [ - ('typesetting', '0011_auto_20200713_1317'), - ('core', '0045_fix_url_emails'), - ] - - - operations = [ - migrations.RunPython(update_setting_values, reverse_code=reverse_code), - ] diff --git a/src/typesetting/migrations/0012_auto_20210126_1203.py b/src/typesetting/migrations/0012_auto_20210126_1203.py deleted file mode 100644 index f0a871d2ea..0000000000 --- a/src/typesetting/migrations/0012_auto_20210126_1203.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2021-01-26 12:03 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0011_auto_20200713_1317'), - ] - - operations = [ - migrations.AddField( - model_name='typesettingassignment', - name='display_proof_comments', - field=models.BooleanField(default=True, help_text='Allow the typesetter to see the proofreading comments'), - ), - migrations.AddField( - model_name='typesettingcorrection', - name='label', - field=models.CharField(blank=True, max_length=255, null=True), - ), - ] diff --git a/src/typesetting/migrations/0013_merge_20210205_1049.py b/src/typesetting/migrations/0013_merge_20210205_1049.py deleted file mode 100644 index 5e31a7c0cf..0000000000 --- a/src/typesetting/migrations/0013_merge_20210205_1049.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2021-02-05 10:49 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0012_auto_20210121_1729'), - ('typesetting', '0012_auto_20210126_1203'), - ] - - operations = [ - ] diff --git a/src/typesetting/migrations/0014_alter_galleyproofing_manager.py b/src/typesetting/migrations/0014_alter_galleyproofing_manager.py deleted file mode 100644 index 67fb6789fa..0000000000 --- a/src/typesetting/migrations/0014_alter_galleyproofing_manager.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.2.20 on 2024-03-15 11:48 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('typesetting', '0013_merge_20210205_1049'), - ] - - operations = [ - migrations.AlterField( - model_name='galleyproofing', - name='manager', - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.SET_NULL, - related_name='galley_manager', - to=settings.AUTH_USER_MODEL - ), - ), - ] diff --git a/src/typesetting/migrations/0015_article_title_safe.py b/src/typesetting/migrations/0015_article_title_safe.py deleted file mode 100644 index 414d7ca72f..0000000000 --- a/src/typesetting/migrations/0015_article_title_safe.py +++ /dev/null @@ -1,66 +0,0 @@ -# Written on Jun 12 2024 - -from django.db import migrations -from utils import migration_utils - - -EMAILS_WITH_RAW_ARTICLE_TITLES = [ - ( - 'typesetting_notify_typesetter', - '

Dear {{ assignment.typesetter.full_name }},

This is a notification from {{ request.user.full_name }} that you have been assigned to the production of article {{ assignment.round.article.title }} on journal {{ request.journal.name }}.

You can view further information on this assignment: {{ typesetting_assignments_url }}.

Regards,

{{ request.user.signature|safe }}

', - ), - ( - 'typesetting_notify_proofreader', - '

Dear {{ assignment.proofreader.full_name }},

This is an notification from {{ request.user.full_name }} that you have been assigned to proofread {{ assignment.round.article.title }} on journal {{ request.journal.name }}.

You can view further information on this assignment: {{ typesetting_assignments_url }}.

Regards,

{{ request.user.signature|safe }}

', - ), - ( - 'typesetting_complete', - '

Dear editors,

This is an automatic notification to inform you that Typesetting is complete for article \"{{ article.title}}\".

Regards,

{{ request.user.signature|safe }}

', - ), - ( - 'typesetting_proofreader_completed', - '

Dear {{assignment.manager.full_name}},

This is a notification to let you know that the proofing you requested for the article {{assignment.round.article.title}}, with article number {{assignment.round.article.pk}}, has now been completed by {{assignment.proofreader.full_name}}.

Best wishes,

', - ), - ( - 'typesetting_proofreader_cancelled', - '

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your proofreading request for the article {{assignment.round.article.title}}, with article number {{assignment.round.article.pk}} has been cancelled. This means that you no longer need to complete this proofreading task

Best wishes,

{{ assignment.manager.signature|safe }}

', - ), - ( - 'typesetting_proofreader_reset', - '

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your proofreading request for the article {{assignment.round.article.title}}, with article number {{assignment.round.article.pk}}, has been reopened. Please log in to the journal using this link in order to complete this proofreading request: {{ typesetting_proofreading_assignments }}.

Thank you for your help,

Best wishes,

{{ assignment.manager.signature|safe }}

', - ), - ( - 'typesetting_typesetter_cancelled', - '

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your typesetting request for the article {{assignment.round.article.title}}, with article number {{assignment.round.article.pk}}, has been cancelled. This means that you no longer need to complete this task.

Thank you for your help,

{{ assignment.manager.signature|safe }}

', - ), - ( - 'typesetting_typesetter_deleted', - '

Dear {{assignment.proofreader.full_name}},

This is a notification to let you know that your typesetting request for the article {{assignment.round.article.title}}, with article number {{assignment.round.article.pk}}, has been deleted. This means that you no longer need to complete this task.

Thank you for your help,

{{ assignment.manager.signature|safe }}

', - ), -] - - -def use_safe_article_title_in_setting_values(apps, schema_editor): - for setting_name, old_value in EMAILS_WITH_RAW_ARTICLE_TITLES: - new_value = old_value.replace('article.title', 'article.safe_title') - migration_utils.update_default_setting_values( - apps, - setting_name, - 'email', - values_to_replace=[old_value], - replacement_value=new_value, - ) - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0014_alter_galleyproofing_manager'), - ] - - operations = [ - migrations.RunPython( - use_safe_article_title_in_setting_values, - reverse_code=migrations.RunPython.noop, - ) - ] diff --git a/src/typesetting/migrations/0016_store_blank_string.py b/src/typesetting/migrations/0016_store_blank_string.py deleted file mode 100644 index 26b04f3741..0000000000 --- a/src/typesetting/migrations/0016_store_blank_string.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.20 on 2024-07-08 16:27 - -import core.model_utils -from django.db import migrations, models - - -def store_empty_string(apps, schema_editor): - TypesettingAssignment = apps.get_model('typesetting', 'TypesettingAssignment') - TypesettingAssignment.objects.filter(task__isnull=True).update(task='') - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0015_article_title_safe'), - ] - - operations = [ - migrations.RunPython( - store_empty_string, - reverse_code=migrations.RunPython.noop - ), - ] diff --git a/src/typesetting/migrations/0017_auto_20240708_1727.py b/src/typesetting/migrations/0017_auto_20240708_1727.py deleted file mode 100644 index 0a9e9cbee9..0000000000 --- a/src/typesetting/migrations/0017_auto_20240708_1727.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.2.20 on 2024-07-08 16:27 - -import core.model_utils -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0016_store_blank_string'), - ] - - operations = [ - migrations.AlterField( - model_name='galleyproofing', - name='notes', - field=core.model_utils.JanewayBleachField(blank=True), - ), - migrations.AlterField( - model_name='galleyproofing', - name='task', - field=core.model_utils.JanewayBleachField(help_text='Add any additional information or instructions for the proofreader here.', verbose_name='Proofing Task'), - ), - migrations.AlterField( - model_name='typesettingassignment', - name='task', - field=core.model_utils.JanewayBleachField( - blank=True, - help_text='The task description if not explained in the typesetting guidelines.', - verbose_name='Typesetting Task', - ), - ), - migrations.AlterField( - model_name='typesettingassignment', - name='typesetter_note', - field=core.model_utils.JanewayBleachField(blank=True, verbose_name='Note to Editor'), - ), - ] diff --git a/src/typesetting/migrations/0018_selected_files.py b/src/typesetting/migrations/0018_selected_files.py deleted file mode 100644 index 526653f0c9..0000000000 --- a/src/typesetting/migrations/0018_selected_files.py +++ /dev/null @@ -1,51 +0,0 @@ -from django.db import migrations, models - - -def select_expected_files(apps, schema_editor): - TypesettingAssignment = apps.get_model('typesetting', 'TypesettingAssignment') - TypesettingRound = apps.get_model('typesetting', 'TypesettingRound') - File = apps.get_model('core', 'File') - for assignment in TypesettingAssignment.objects.exclude( - round__article__stage='Archived', - ): - article = assignment.round.article - - data_figure_files = File.objects.filter( - data_figure_files=article, - ) - for file in data_figure_files: - assignment.files_to_typeset.add(file) - - galley_files = File.objects.filter( - galley__article=article, - ) - for file in galley_files: - assignment.files_to_typeset.add(file) - - rounds = TypesettingRound.objects.filter(article=article) - if rounds.count() > 1: - previous_round = rounds[1] - else: - previous_round = None - if previous_round and assignment.display_proof_comments: - proofing_files = File.objects.filter( - galleyproofing__round__article=article, - galleyproofing__round=previous_round, - galleyproofing__completed__isnull=False, - ) - for file in proofing_files: - assignment.files_to_typeset.add(file) - - -class Migration(migrations.Migration): - - dependencies = [ - ('typesetting', '0017_auto_20240708_1727'), - ] - - operations = [ - migrations.RunPython( - select_expected_files, - reverse_code=migrations.RunPython.noop - ), - ] diff --git a/src/typesetting/migrations/__init__.py b/src/typesetting/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/typesetting/models.py b/src/typesetting/models.py deleted file mode 100644 index 6b10845b9b..0000000000 --- a/src/typesetting/models.py +++ /dev/null @@ -1,523 +0,0 @@ -from datetime import date, timedelta - -from django.db import models -from django.utils import timezone - -from core.model_utils import JanewayBleachField -from plugins.typesetting import plugin_settings -from utils import models as utils_models -from utils import notify_helpers -from events import logic as events_logic -from submission import models as submission_models - - -def review_choices(): - return ( - ('accept', 'Accept'), - ('corrections', 'Corrections Required'), - ('proofing', 'Proofing Required'), - ) - - -class TypesettingClaim(models.Model): - editor = models.ForeignKey( - 'core.Account', - on_delete=models.CASCADE, - ) - article = models.OneToOneField( - 'submission.Article', - on_delete=models.CASCADE, - ) - claimed = models.DateTimeField(default=timezone.now) - - class Meta: - unique_together = ('editor', 'article',) - - -class TypesettingRound(models.Model): - article = models.ForeignKey( - 'submission.Article', - on_delete=models.CASCADE, - ) - round_number = models.PositiveIntegerField(default=1) - date_created = models.DateTimeField(auto_now_add=True) - - class Meta: - ordering = ('-round_number', 'date_created') - unique_together = ('round_number', 'article',) - - def __str__(self): - return str(self.round_number) - - @property - def has_completed_proofing(self): - return GalleyProofing.objects.filter( - round=self, - accepted__isnull=False, - completed__isnull=False, - ) - - @property - def has_open_tasks(self): - if hasattr(self, 'typesettingassignment'): - if not self.typesettingassignment.done: - return True - - if self.galleyproofing_set.filter(completed__isnull=True).exists(): - return True - - return False - - def close(self, user=None): - """ Method that closes a round by cancelling any open tasks """ - if hasattr(self, 'typesettingassignment'): - if self.typesettingassignment.is_active: - self.typesettingassignment.cancel(user=user) - - for proofing in self.galleyproofing_set.filter( - completed__isnull=True, - ): - proofing.cancel(user=user) - - -class ActiveTypesettingAssignmentManager(models.Manager): - def get_queryset(self): - return super(ActiveTypesettingAssignmentManager, self).get_queryset().exclude( - round__article__stage=submission_models.STAGE_ARCHIVED, - ) - - -class TypesettingAssignment(models.Model): - round = models.OneToOneField( - TypesettingRound, - on_delete=models.CASCADE, - ) - manager = models.ForeignKey( - 'core.Account', - null=True, - blank=True, - on_delete=models.SET_NULL, - related_name='manager', - ) - typesetter = models.ForeignKey( - 'core.Account', - null=True, - on_delete=models.SET_NULL, - related_name='typesetter', - ) - - assigned = models.DateTimeField(default=timezone.now) - notified = models.BooleanField(default=False) - accepted = models.DateTimeField(blank=True, null=True) - due = models.DateField(null=True) - completed = models.DateTimeField(blank=True, null=True) - cancelled = models.DateTimeField(blank=True, null=True) - reviewed = models.BooleanField(default=False) - display_proof_comments = models.BooleanField( - default=True, - help_text="Allow the typesetter to see the proofreading comments", - ) - review_decision = models.CharField( - choices=review_choices(), - max_length=21, - blank=True, - ) - - task = JanewayBleachField( - blank=True, - verbose_name='Typesetting Task', - help_text='The task description if not explained in the typesetting guidelines.', - ) - files_to_typeset = models.ManyToManyField( - 'core.File', - related_name='files_to_typeset', - blank=True, - ) - galleys_created = models.ManyToManyField( - 'core.Galley', - blank=True, - ) - typesetter_note = JanewayBleachField( - blank=True, - verbose_name='Note to Editor', - ) - - objects = models.Manager() - active_objects = ActiveTypesettingAssignmentManager() - - @property - def time_to_due(self): - if not self.due: - return '' - due = self.due - timezone.now().date() - if due == timedelta(0): - return 'Due Today' - elif due < timedelta(0): - return 'Overdue' - - return '{} days'.format(due.days) - - @property - def is_active(self): - return self.assigned and not self.completed - - @property - def status(self): - if self.cancelled: - return "cancelled" - if self.assigned and not self.accepted and not self.completed: - return "assigned" - elif self.assigned and self.accepted and not self.completed: - return "accepted" - elif self.declined: - return "declined" - elif self.done and not self.reviewed: - return "completed" - elif self.done and self.reviewed: - return self.get_review_decision_display() - else: - return "unknown" - - @property - def done(self): - return self.completed and self.accepted - - @property - def declined(self): - return self.completed and not self.accepted - - @property - def is_overdue(self): - return self.due and self.due < date.today() - - def reopen(self, user=None): - self.completed = self.accepted = None - self.notified = False - utils_models.LogEntry.add_entry( - types="Typesetting reopened", - description="The typesetting assignment {self.pk} has been " - "re-opened by user {user}".format(self=self, user=user), - level="INFO", - actor=user, - target=self.round.article, - ) - self.save() - - def delete(self, user=None): - utils_models.LogEntry.add_entry( - types="Typesetting deleted", - description="The typesetting assignment {self.pk} has been " - "deleted by user {user}".format(self=self, user=user), - level="INFO", - actor=user, - target=self.round.article, - ) - super().delete() - - def cancel(self, user=None): - utils_models.LogEntry.add_entry( - types="Typesetting Task cancelled", - description="The typesetting assignment {self.pk} has been " - "cancelled by user {user}".format(self=self, user=user), - level="INFO", - actor=user, - target=self.round.article, - ) - self.cancelled = timezone.now() - self.save() - - def complete(self, note='', user=None): - utils_models.LogEntry.add_entry( - types="Typesetting Task Completed", - description="The typesetting assignment {self.pk} has been " - "completed by user {user}".format(self=self, user=user), - level="INFO", - actor=user, - target=self.round.article, - ) - - self.typesetter_note = note - - if not self.accepted: - self.accepted = timezone.now() - - self.completed = timezone.now() - self.save() - - FRIENDLY_STATUSES = { - "assigned": "Awaiting response from the typesetter.", - "accepted": "Typesetter has accepted task, awaiting completion.", - "declined": "Typesetter has declined this task.", - "completed": "The typesetter has completed their task. " - "You should review the uploaded galley files.", - "cancelled": "The manager has cancelled this typesetting task", - "closed": "Task closed", - "unknown": "Task status unknown", - "Corrections Required": "This article requires corrections.", - "Proofing Required": "This article requires proofing.", - "Accept": "Typesetting for this article has been completed. However," - " if you want to make further changes, you can still assign" - " proofreaders or start a new typesetting round.", - } - - @property - def friendly_status(self): - return self.FRIENDLY_STATUSES.get(self.status) - - def proofing_assignments_for_corrections(self): - """ Returns the proofreading assignemnts for corrections - The proofreadings relevant for round n of proofing would have been - stored against round n-1 of this article - """ - rounds = TypesettingRound.objects.filter(article=self.round.article) - if rounds.count() > 1: - previous_round = rounds[1] - proofing_assignments = previous_round.galleyproofing_set.filter( - completed__isnull=False, - cancelled=False, - ) - return proofing_assignments - else: - return GalleyProofing.objects.none() - - def __str__(self): - return f'Typesetter {self.typesetter} assigned to article {self.round.article}' - - -class ActiveGalleyProofingManager(models.Manager): - def get_queryset(self): - return super(ActiveGalleyProofingManager, self).get_queryset().exclude( - round__article__stage=submission_models.STAGE_ARCHIVED - ) - - -class GalleyProofing(models.Model): - round = models.ForeignKey( - TypesettingRound, - on_delete=models.CASCADE, - ) - manager = models.ForeignKey( - 'core.Account', - null=True, - related_name='galley_manager', - on_delete=models.SET_NULL, - ) - proofreader = models.ForeignKey( - 'core.Account', - null=True, - on_delete=models.SET_NULL, - - ) - assigned = models.DateTimeField(default=timezone.now) - notified = models.BooleanField(default=False) - due = models.DateTimeField(default=None, verbose_name="Date Due") - accepted = models.DateTimeField(blank=True, null=True) - completed = models.DateTimeField(blank=True, null=True) - cancelled = models.BooleanField(default=False) - - task = JanewayBleachField( - verbose_name="Proofing Task", - help_text='Add any additional information or instructions ' - 'for the proofreader here.', - ) - proofed_files = models.ManyToManyField('core.Galley', blank=True) - notes = JanewayBleachField(blank=True) - annotated_files = models.ManyToManyField('core.File', blank=True) - - objects = models.Manager() - active_objects = ActiveGalleyProofingManager() - - class Meta: - ordering = ('assigned', 'accepted', 'pk') - - def __str__(self): - return 'Proofing for Article {0} by {1}'.format( - self.round.article.title, - self.proofreader.full_name(), - ) - - def assign(self, user=None, skip=False): - if not skip: - self.notified = True - self.save() - - utils_models.LogEntry.add_entry( - types='Proofreader Assigned', - description='{} assigned as a proofreader by {}'.format( - self.proofreader.full_name(), - user, - ), - level='Info', - actor=user, - target=self.round.article, - ) - - def cancel(self, user=None): - self.cancelled = True - self.completed = timezone.now() - self.save() - - utils_models.LogEntry.add_entry( - types='Proofreading Assignment Cancelled', - description='Proofing by {} cancelled by {}'.format( - self.proofreader.full_name(), - user, - ), - level='Info', - actor=user, - target=self.round.article, - ) - - def reset(self, user=None): - self.cancelled = False - self.completed = None - self.accepted = None - self.save() - - utils_models.LogEntry.add_entry( - types='Proofreading Assignment Reset', - description='Proofing by {} reset by {}'.format( - self.proofreader.full_name(), - user, - ), - level='Info', - actor=user, - target=self.round.article, - ) - - def complete(self, user=None): - self.cancelled = False - self.completed = timezone.now() - self.accepted = timezone.now() - self.save() - - utils_models.LogEntry.add_entry( - types='Proofreading Assignment Complete', - description='Proofing by {} completed'.format( - user, - ), - level='Info', - actor=user, - target=self.round.article, - ) - - def unproofed_galleys(self, galleys): - check = [] - proofed_files = self.proofed_files.all() - - for galley in galleys: - if galley not in proofed_files: - check.append(galley) - - return check - - @property - def time_to_due(self): - due = self.due.date() - timezone.now().date() - - if due == timedelta(0): - return 'Due Today' - elif due < timedelta(0): - return 'Overdue' - - return '{} days'.format(due.days) - - FRIENDLY_STATUSES = { - "assigned": "Awaiting response from the proofreader.", - "accepted": "Proofreader has accepted task, awaiting completion.", - "declined": "Proofreader has declined this task.", - "completed": "The proofreader has completed their task. " - "You should review their response.", - "unknown": "Task status unknown.", - "cancelled": "Task was cancelled by manager/editor." - } - - @property - def status(self): - if self.cancelled: - return 'cancelled' - elif self.assigned and self.accepted and not self.completed: - return 'accepted' - elif self.assigned and self.completed and not self.accepted: - return 'declined' - elif self.assigned and self.completed and self.accepted: - return 'completed' - elif self.assigned and not self.accepted and not self.completed: - return 'assigned' - else: - return 'unknown' - - @property - def friendly_status(self): - return self.FRIENDLY_STATUSES.get(self.status) - - def send_assignment_notification(self, request, message, skip=False): - description = '{0} has been assigned as a proofreader for {1}'.format( - self.proofreader.full_name(), - self.round.article.title, - ) - - if not skip: - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Proofing Assignment', - 'target': self.round.article, - } - notify_helpers.send_email_with_body_from_user( - request, - 'Proofing Request', - self.proofreader.email, - message, - log_dict=log_dict, - ) - notify_helpers.send_slack( - request, - description, - ['slack_editors'], - ) - - self.notified = True - self.save() - - -class TypesettingCorrection(models.Model): - task = models.ForeignKey( - "typesetting.TypesettingAssignment", - related_name="corrections", - blank=True, - on_delete=models.CASCADE, - ) - galley = models.ForeignKey( - "core.Galley", - null=True, - blank=True, - on_delete=models.SET_NULL, - ) - # A copy of the galley label, in case the galley is deleted - label = models.CharField(max_length=255, blank=True, null=True) - date_requested = models.DateTimeField(auto_now_add=True) - date_completed = models.DateTimeField(blank=True, null=True) - date_declined = models.DateTimeField(blank=True, null=True) - # A copy of the file checksum to detect changes when requesting corrections - file_checksum = models.CharField(max_length=255, blank=True, null=True) - - @property - def status(self): - _status = "pending" - if self.date_completed: - _status = "completed" - elif self.date_declined: - _status = "declined" - return _status - - def save(self, *args, **kwargs): - if not self.pk and not self.file_checksum: - self.file_checksum = self.galley.file.checksum() - super().save(*args, **kwargs) - - @property - def corrected(self): - if self.galley: - return self.file_checksum != self.galley.file.checksum() - return False diff --git a/src/typesetting/notifications/__init__.py b/src/typesetting/notifications/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/typesetting/notifications/emails.py b/src/typesetting/notifications/emails.py deleted file mode 100644 index e548f70ca9..0000000000 --- a/src/typesetting/notifications/emails.py +++ /dev/null @@ -1,272 +0,0 @@ -from django.shortcuts import reverse - -from utils import notify_helpers -from utils import models as utils_models - - -def send_typesetting_complete(**kwargs): - request = kwargs['request'] - article = kwargs['article'] - - description = 'Typesetting has been completed for article {0}.'.format( - article.title) - - log_dict = { - 'level': 'Info', 'action_text': description, - 'types': 'Typesetting Complete', - 'actor': request.user, - 'target': article, - } - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typesetting_complete', - 'subject_typesetting_complete', - article.editor_emails(), - {'article': article}, - log_dict=log_dict, - ) - notify_helpers.send_slack(request, description, ['slack_editors']) - - -def send_proofreader_assign_notification(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - message = kwargs['message'] - skip = kwargs['skip'] - - description = '{0} has been assigned as a proofreader for {1}'.format( - assignment.proofreader.full_name(), - assignment.round.article.title, - ) - - if not skip: - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Proofing Assignment', - 'target': assignment.round.article, - } - notify_helpers.send_email_with_body_from_user( - request, - 'Proofing Request', - assignment.proofreader.email, - message, - log_dict=log_dict, - ) - notify_helpers.send_slack( - request, - description, - ['slack_editors'], - ) - else: - utils_models.LogEntry.add_entry( - types='Proofing Assignment', - description=description, - level='Info', - request=request, - target=assignment.round.article, - ) - - -def send_proofreader_assign_transaction_email(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - event_type = kwargs.get('event_type') - - description = '{user} has {action} the proofreading assignment for {article} assigned to {proofreader}'.format( - user=request.user, - action=event_type, - article=assignment.round.article.title, - proofreader=assignment.proofreader.full_name(), - ) - - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Proofreading Assignment {}'.format(event_type), - 'target': assignment.round.article, - } - - if event_type in ['cancelled', 'reset']: - message_target = assignment.proofreader.email - else: - message_target = assignment.manager.email - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typesetting_proofreader_{}'.format(event_type), - 'Proofreader Assignment {}'.format(event_type), - message_target, - context={ - 'assignment': assignment, - 'event_type': event_type, - }, - log_dict=log_dict, - ) - notify_helpers.send_slack( - request, - description, - ['slack_editors'], - ) - - -def send_typesetting_assign_notification(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - skip = kwargs['skip'] - message = kwargs['message'] - - description = '{0} has been assigned as a typesetter for {1}'.format( - assignment.typesetter.full_name(), - assignment.round.article.title, - ) - - if not skip: - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Typesetting Assignment', - 'target': assignment.round.article, - } - notify_helpers.send_email_with_body_from_user( - request, - 'subject_typesetter_notification', - assignment.typesetter.email, - message, - log_dict=log_dict, - ) - notify_helpers.send_slack( - request, - description, - ['slack_editors'], - ) - else: - utils_models.LogEntry.add_entry( - types='Typesetting Assignment', - description=description, - level='Info', - request=request, - target=assignment.round.article, - ) - - -def send_typesetting_assign_decision(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - decision = kwargs['decision'] - note = kwargs['note'] - - description = 'Typesetting task {0} decision made by {1}: {2}'.format( - assignment.pk, - assignment.typesetter.full_name(), - decision, - ) - - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Typesetting Assignment Decision', - 'target': assignment.round.article, - } - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typsetting_typesetter_decision_{}'.format(decision), - 'Typesetting Assignment Decision', - assignment.manager.email, - context={'assignment': assignment, 'note': note}, - log_dict=log_dict, - ) - - notify_helpers.send_slack(request, description, ['slack_editors']) - - -def send_typesetting_assign_cancelled(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - - description = 'Typesetting task {0} cancelled by {1}'.format( - assignment.pk, - request.user, - ) - - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Typesetting Assignment Cancelled', - 'target': assignment.round.article, - } - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typesetting_typesetter_cancelled', - 'Typesetting Assignment Cancelled', - assignment.typesetter.email, - context={'assignment': assignment}, - log_dict=log_dict, - ) - - notify_helpers.send_slack(request, description, ['slack_editors']) - - -def send_typesetting_assign_deleted(**kwargs): - assignment = kwargs['assignment'] - request = kwargs['request'] - - description = 'Typesetting task {0} deleted by {1}'.format( - assignment.pk, - request.user, - ) - - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Typesetting Assignment Deleted', - 'target': assignment.round.article, - } - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typesetting_typesetter_deleted', - 'Typesetting Assignment Deleted', - assignment.typesetter.email, - context={'assignment': assignment}, - log_dict=log_dict, - ) - - notify_helpers.send_slack(request, description, ['slack_editors']) - - -def send_typesetting_assign_complete(**kwargs): - assignment = kwargs['assignment'] - article = assignment.round.article - request = kwargs['request'] - url = request.journal.site_url( - reverse("typesetting_article", kwargs={"article_id": article.pk}) - ) - - description = 'Typesetting task completed by {0}'.format( - assignment.typesetter.full_name(), - ) - - log_dict = { - 'level': 'Info', - 'action_text': description, - 'types': 'Typesetting Complete', - 'target': article, - } - - notify_helpers.send_email_with_body_from_setting_template( - request, - 'typesetting_typesetter_complete', - 'Typesetting Assignment Complete', - assignment.manager.email, - context={ - 'assignment': assignment, - 'typesetting_article_url': url, - }, - log_dict=log_dict, - ) - - notify_helpers.send_slack(request, description, ['slack_editors']) diff --git a/src/typesetting/notifications/notify.py b/src/typesetting/notifications/notify.py deleted file mode 100644 index 9012fa1424..0000000000 --- a/src/typesetting/notifications/notify.py +++ /dev/null @@ -1,132 +0,0 @@ -from plugins.typesetting import plugin_settings -from events import logic as events_logic - - -def event_typesetting_assignment(request, assignment, message, skip): - kwargs = { - 'assignment': assignment, - 'request': request, - 'message': message, - 'skip': skip, - } - - events_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_ASSIGN_NOTIFICATION, - task_object=assignment.round.article, - **kwargs, - ) - - if not skip: - assignment.notified = True - assignment.save() - - -def event_decision_notification(assignment, request, note, decision): - kwargs = { - 'assignment': assignment, - 'request': request, - 'note': note, - 'decision': decision, - } - - events_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_ASSIGN_DECISION, - task_object=assignment.round.article, - **kwargs, - ) - - -def event_typesetting_cancelled(assignment, request): - kwargs = { - 'assignment': assignment, - 'request': request, - } - - events_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_ASSIGN_CANCELLED, - task_object=assignment.round.article, - **kwargs, - ) - - -def event_typesetting_deleted(assignment, request): - kwargs = { - 'assignment': assignment, - 'request': request, - } - - events_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_ASSIGN_DELETED, - task_object=assignment.round.article, - **kwargs, - ) - - -def event_complete_notification(assignment, request): - kwargs = { - 'assignment': assignment, - 'request': request, - } - - events_logic.Events.raise_event( - plugin_settings.ON_TYPESETTING_ASSIGN_COMPLETE, - task_object=assignment.round.article, - **kwargs, - ) - - -def galley_proofing_assignment(request, assignment, message, skip): - kwargs = { - 'assignment': assignment, - 'request': request, - 'message': message, - 'skip': skip, - } - - events_logic.Events.raise_event( - plugin_settings.ON_PROOFREADER_ASSIGN_NOTIFICATION, - task_object=assignment.round.article, - **kwargs, - ) - - -def galley_proofing_cancel(request, assignment): - kwargs = { - 'assignment': assignment, - 'request': request, - 'event_type': 'cancelled', - } - - events_logic.Events.raise_event( - plugin_settings.ON_PROOFREADER_ASSIGN_CANCELLED, - task_object=assignment.round.article, - **kwargs, - ) - - -def galley_proofing_reset(request, assignment): - kwargs = { - 'assignment': assignment, - 'request': request, - 'event_type': 'reset', - } - - events_logic.Events.raise_event( - plugin_settings.ON_PROOFREADER_ASSIGN_RESET, - task_object=assignment.round.article, - **kwargs, - ) - - -def galley_proofing_complete(request, assignment): - kwargs = { - 'assignment': assignment, - 'request': request, - 'event_type': 'completed' - } - - events_logic.Events.raise_event( - plugin_settings.ON_PROOFREADER_ASSIGN_COMPLETE, - task_object=assignment.round.article, - **kwargs, - ) diff --git a/src/typesetting/plugin_settings.py b/src/typesetting/plugin_settings.py deleted file mode 100644 index 3cd9911287..0000000000 --- a/src/typesetting/plugin_settings.py +++ /dev/null @@ -1,122 +0,0 @@ -from events import logic as events_logic -from utils import plugins -from utils.install import update_settings - -PLUGIN_NAME = 'Typesetting Plugin' -DISPLAY_NAME = 'Typesetting' -DESCRIPTION = 'An alternative for Production/Proofing' -AUTHOR = 'Birkbeck Centre for Technology and Publishing' -VERSION = '1.6' -SHORT_NAME = 'typesetting' -MANAGER_URL = 'typesetting_manager' -JANEWAY_VERSION = '1.7.0' - -# Workflow Settings -IS_WORKFLOW_PLUGIN = True -JUMP_URL = 'typesetting_article' -HANDSHAKE_URL = 'typesetting_articles' -ARTICLE_PK_IN_HANDSHAKE_URL = True -STAGE = 'typesetting_plugin' -KANBAN_CARD = 'typesetting/elements/card.html' -DASHBOARD_TEMPLATE = 'typesetting/elements/dashboard.html' - -ON_TYPESETTING_COMPLETE = "on_typesetting_complete" -ON_TYPESETTING_ASSIGN_NOTIFICATION = "on_typesetting_assign_notification" -ON_TYPESETTING_ASSIGN_DECISION = "on_typesetting_assign_decision" -ON_TYPESETTING_ASSIGN_CANCELLED = "on_typesetting_assign_cancelled" -ON_TYPESETTING_ASSIGN_DELETED = "on_typesetting_assign_deleted" -ON_TYPESETTING_ASSIGN_COMPLETE = "on_typesetting_assign_complete" -ON_PROOFREADER_ASSIGN_NOTIFICATION = "on_proofreader_assign_notification" -ON_PROOFREADER_ASSIGN_CANCELLED = "on_proofreader_assign_cancelled" -ON_PROOFREADER_ASSIGN_RESET = "on_proofreader_assign_reset" -ON_PROOFREADER_ASSIGN_COMPLETE = "on_proofreader_assign_complete" - - -class TypesettingPlugin(plugins.Plugin): - plugin_name = PLUGIN_NAME - display_name = DISPLAY_NAME - description = DESCRIPTION - author = AUTHOR - short_name = SHORT_NAME - stage = STAGE - - manager_url = MANAGER_URL - - version = VERSION - janeway_version = JANEWAY_VERSION - - is_workflow_plugin = IS_WORKFLOW_PLUGIN - handshake_url = HANDSHAKE_URL - article_pk_in_handshake_url = ARTICLE_PK_IN_HANDSHAKE_URL - - -def install(): - TypesettingPlugin.install() - update_settings( - file_path='plugins/typesetting/install/settings.json' - ) - - -def hook_registry(): - return { - 'core_article_tasks': - { - 'module': 'plugins.typesetting.hooks', - 'function': 'author_tasks', - }, - } - - -def register_for_events(): - # Plugin modules can't be imported until plugin is loaded - from plugins.typesetting.notifications import emails - - events_logic.Events.register_for_event( - ON_TYPESETTING_ASSIGN_NOTIFICATION, - emails.send_typesetting_assign_notification, - ) - - events_logic.Events.register_for_event( - ON_TYPESETTING_ASSIGN_DECISION, - emails.send_typesetting_assign_decision, - ) - - events_logic.Events.register_for_event( - ON_TYPESETTING_ASSIGN_CANCELLED, - emails.send_typesetting_assign_cancelled, - ) - - events_logic.Events.register_for_event( - ON_TYPESETTING_ASSIGN_DELETED, - emails.send_typesetting_assign_deleted, - ) - - events_logic.Events.register_for_event( - ON_TYPESETTING_ASSIGN_COMPLETE, - emails.send_typesetting_assign_complete, - ) - - events_logic.Events.register_for_event( - ON_PROOFREADER_ASSIGN_NOTIFICATION, - emails.send_proofreader_assign_notification, - ) - - events_logic.Events.register_for_event( - ON_PROOFREADER_ASSIGN_CANCELLED, - emails.send_proofreader_assign_transaction_email, - ) - - events_logic.Events.register_for_event( - ON_PROOFREADER_ASSIGN_RESET, - emails.send_proofreader_assign_transaction_email, - ) - - events_logic.Events.register_for_event( - ON_PROOFREADER_ASSIGN_COMPLETE, - emails.send_proofreader_assign_transaction_email, - ) - - events_logic.Events.register_for_event( - ON_TYPESETTING_COMPLETE, - emails.send_typesetting_complete, - ) diff --git a/src/typesetting/security.py b/src/typesetting/security.py deleted file mode 100644 index 7a7d2bc4a6..0000000000 --- a/src/typesetting/security.py +++ /dev/null @@ -1,182 +0,0 @@ -from functools import wraps - -from django.shortcuts import reverse, redirect, get_object_or_404, Http404 -from django.core.exceptions import PermissionDenied -from django.contrib import messages - -from plugins.typesetting import models, plugin_settings -from security.decorators import base_check, deny_access -from submission import models as submission_models -from core import models as core_models - - -def proofreader_for_article_required(func): - """ - Checks that the current user is the proofreader for the current task. - :param func: the function to callback from the decorator - :return: either the function call or raises an PermissionDenied - """ - - def wrapper(request, *args, **kwargs): - if not base_check(request): - return redirect( - '{0}?next={1}'.format( - reverse('core_login'), - request.path, - ) - ) - - elif request.user.is_editor(request) or request.user.is_staff or request.user.is_production(request): - return func(request, *args, **kwargs) - - # User is Assigned as proofreader, regardless of role - elif models.GalleyProofing.objects.filter( - pk=kwargs['assignment_id'], - proofreader=request.user, - cancelled=False, - completed__isnull=True, - round__article__journal=request.journal, - ).exists(): - return func(request, *args, **kwargs) - - else: - deny_access(request) - - return wrapper - - -def can_preview_typesetting_article(func): - """ Checks if the user should be allowed to preview articles files - - The user should either be an editor/production manager, a proofreader - for the article or a typesetter for the article - :param func: the function to callback from the decorator - :return: either the function call or raises an PermissionDenied - """ - - def wrapper(request, *args, **kwargs): - assignment_id = kwargs.get('assignment_id') - if not base_check(request): - return redirect( - '{0}?next={1}'.format( - reverse('core_login'), - request.path, - ) - ) - - elif request.user.is_editor(request) or request.user.is_staff or request.user.is_production(request): - return func(request, *args, **kwargs) - - # User is Assigned as proofreader, regardless of role - elif assignment_id and models.GalleyProofing.objects.filter( - pk=assignment_id, - proofreader=request.user, - cancelled=False, - completed__isnull=True, - round__article__journal=request.journal, - ).exists(): - return func(request, *args, **kwargs) - - # User is Assigned as typesetter, regardless of role - elif assignment_id and models.TypesettingAssignment.objects.filter( - pk=assignment_id, - typesetter=request.user, - cancelled__isnull=True, - round__article__journal=request.journal, - ).exists(): - return func(request, *args, **kwargs) - else: - deny_access(request) - - return wrapper - - -def require_not_notified(object_model): - """ - Decorator that checks if an object's notified boolean attribute is True - and redirects - """ - def decorator(func): - @wraps(func) - def inner(request, *args, **kwargs): - assignment_id = kwargs.get('assignment_id') - - if not assignment_id: - raise Http404 - - object_to_check = get_object_or_404( - object_model, - pk=assignment_id, - ) - - if object_to_check.notified: - raise PermissionDenied( - "Notification for this assignment has already been sent.", - ) - - return func(request, *args, **kwargs) - return inner - return decorator - - -def user_can_manage_file(func): - """ - A decorator for checking if the current user can manage a file. - """ - def wrapper(request, *args, **kwargs): - file_object_id = kwargs.get('file_id', None) - - if not file_object_id: - raise Http404 - - file_object = get_object_or_404( - core_models.File, - pk=file_object_id, - ) - - if can_manage_file(request, file_object): - return func(request, *args, **kwargs) - - return deny_access(request) - - return wrapper - - -def can_manage_file(request, file_object): - """ - Determines if a user can view and download a file in the Typesetting Plugin. - """ - if request.user.is_anonymous: - return redirect( - '{0}?next={1}'.format( - reverse('core_login'), - request.path - ) - ) - - if ( - request.user.is_staff or - request.user.is_editor(request) - ): - return True - - if file_object.article_id: - # Check if there is a workflow log entry for the typesetting plugin. - if not core_models.WorkflowLog.objects.filter( - article__pk=file_object.article_id, - article__journal=request.journal, - element__element_name=plugin_settings.PLUGIN_NAME, - ).exists(): - return False - else: - # Files without article ids should not be downloadable here. - return False - - if ( - request.user.is_production(request) or - file_object.owner == request.user - ): - return True - - # deny access to all others - return False diff --git a/src/typesetting/templates/typesetting/assign_typesetter.html b/src/typesetting/templates/typesetting/assign_typesetter.html deleted file mode 100644 index d87b402a82..0000000000 --- a/src/typesetting/templates/typesetting/assign_typesetter.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load foundation %} -{% load static %} - -{% block title %}Assign Typesetter{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Assign Typesetter
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -

    Assign Typesetter to {{ article.title|safe }}

    -
    -
    - {% if not article.issue and not article.projected_issue %} -
    -
    Article missing primary or projected issue
    -

    - This article doesn't have a primary or projected issue, so the typesetter won't know what issue it belongs to. You can - - assign one here. - -

    - -
    - {% endif %} -

    Select a typesetter and detail what files you would like them to generate. They will have access to:

    -
      -
    • Any files you select to share with them.
      • -
    • Any galley files they have uploaded in this or previous rounds.
      • -
    • All of the article’s metadata.
      • -
    -
    -
    -
    - {% include "elements/forms/errors.html" %} - {% csrf_token %} -
    -
    - {% include 'typesetting/elements/typesetting_assignment_fields.html' %} - -
    -
    - -
    - - {% if form.modal %} - {% include "admin/elements/confirm_modal.html" with modal=form.modal form_id="assign_typesetter" %} - {% endif %} - -{% endblock %} - -{% block js %} - {% if form.modal %} - {% include "admin/elements/open_modal.html" with target=form.modal.id %} - {% endif %} - {% include "elements/datatables.html" with target="#typesetter #file_list" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/breadcrumbs/typesetting_base.html b/src/typesetting/templates/typesetting/breadcrumbs/typesetting_base.html deleted file mode 100644 index 3a738a0212..0000000000 --- a/src/typesetting/templates/typesetting/breadcrumbs/typesetting_base.html +++ /dev/null @@ -1,9 +0,0 @@ -
  • - Articles in Typesetting -
    • - -{% if article %} -
  • - {{ article.title|safe }} -
    • -{% endif %} \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/crossref/crossref_component.xml b/src/typesetting/templates/typesetting/crossref/crossref_component.xml deleted file mode 100644 index 61845e5acc..0000000000 --- a/src/typesetting/templates/typesetting/crossref/crossref_component.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - {{ batch_id }} - {{ now|date:"YmdHis" }}{{ timestamp_suffix }} - - {{ depositor_name }} - {{ depositor_email }} - - {{ registrant }} - - - - - - - {{ supp_file.file.label }} - - - - {{ doi }} - {{ supp_file.url }} - - - - - - diff --git a/src/typesetting/templates/typesetting/edit_galley.html b/src/typesetting/templates/typesetting/edit_galley.html deleted file mode 100644 index 501d9a8c37..0000000000 --- a/src/typesetting/templates/typesetting/edit_galley.html +++ /dev/null @@ -1,371 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load securitytags %} -{% load typesetting_file_permissions %} -{% load files %} -{% load foundation %} - -{% block title %}Edit Typeset File - {{ galley.pk }}{% endblock title %} -{% block title-section %}Edit Typeset File - {{ galley.pk }}{% endblock %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Edit Typeset File
    • -{% endblock breadcrumbs %} - - -{% block body %} -
    -
    -

    Metadata

    - {% if return_url %} - Back{% endif %} -
    -
    - - - - - - - - - - {% can_manage_file galley.file as can_view_file_flag %} - {% can_edit_file galley.file article as can_edit_file_flag %} - {% can_view_file_history galley.file article as can_view_file_history_flag %} - - - - - - - - -
    LabelFilenameTypeModifiedDownloadHistory
    {{ galley.label }}{{ galley.file.original_filename|truncatechars:40 }}Typeset File{{ galley.file.last_modified|date:"Y-m-d G:i" }} -   - {% if can_view_file_history_flag %} - -  {% endif %} -
    -
    -
    - -
    -
    -

    Replace File

    -
    -
    -

    You can upload a new file to replace the existing one.

    -
    -
    -
    - {% csrf_token %} - -
    -
    - -
    - -
    -
    -
    -
    -
    -

    Typeset File Details

    -
    -
    -
    -
    -
    - {% csrf_token %} - {% include "admin/elements/forms/errors.html" with form=galley_form %} - {{ galley_form|foundation }} -
    -
    - -
    -
    -
    -
    -
    -
    -
    - {% if galley.file.mime_type in galley.mimetypes_with_figures %} -
    - -
    -

    Image Files

    -
    -
    -

    - You can upload image files associated with the XML/HTML file. - We will display those we have detected but you can - upload your own. The uploaded filename should match the src or href of the file - in your XML/HTML and should be relative eg. src="fig1.jpg". -

    - - - - - - - - - - - - - {% for image in galley.images.all %} - {% can_view_file image as can_view_file_flag %} - {% can_edit_file image article as can_edit_file_flag %} - {% can_view_file_history image article as can_view_file_history_flag %} - - - - - - - - - - - {% empty %} - - {% endfor %} - -
    LabelFilenameTypeModifiedDownloadReplaceHistoryDelete
    {{ image.label }}{{ image.original_filename }}Galley Images{{ image.last_modified|date:"Y-m-d G:i" }}{% if can_view_file_flag %} -  {% endif %} - {% if can_edit_file_flag %} -  {% endif %} - {% if can_view_file_history_flag %} - -  {% endif %} - {% if can_edit_file_flag %} -
    - {% csrf_token %} - {% endif %}
    -
    - Typeset file has no images, you can upload them below. -
    -
    - {% if galley.file.mime_type in galley.mimetypes_with_figures %} - {% for element in galley.has_missing_image_files %} - {% if element not in image_names %} -
    -
    - -
    - {% csrf_token %} -
    -
    -
    {{ element }}
    - -

    - - - {% if data_files %} -

    Or, you can choose an existing figure file.

    - - {% endif %} -
    -
    - -
    -
    -
    -     -
    -
    - {% endif %} - {% endfor %} - {% endif %} -
    -
    - -
    - {% csrf_token %} -
    -
    -
    Additional File Images
    - -

    - -
    -
    - -
    -
    -
    -     -
    -
    - {% if galley.has_missing_image_files %} -
    -
    - -
    - {% csrf_token %} -
    -
    -
    Upload Zip File
    -

    You can upload a zip file of images using the - {% if typeset_task %} - - {% else %} - - {% endif %} - Zip Uploader - . -

    -
    -
    -
    -     -
    -
    - {% endif %} -
    -
    -
    -
    -

    CSS File

    -
    -
    - -

    - You can upload a CSS file associated with this article for individual style. You should be - wary not to make style changes - to header and footer type elements as this will effect the layout of the page. -

    - - - - - - - - - - - {% if galley.css_file %} - {% can_view_file galley.css_file as can_view_file_flag %} - {% can_edit_file galley.css_file article as can_edit_file_flag %} - {% can_view_file_history galley.css_file article as can_view_file_history_flag %} - - - - - - - - - - {% endif %} -
    LabelFilenameTypeDownloadReplaceHistoryDelete
    {{ galley.css_file.label }}{{ galley.css_file.original_filename }}Galley Images{% if can_view_file_flag %} -  {% endif %} - {% if can_edit_file_flag %} -  {% endif %} - {% if can_view_file_history_flag %} - -  {% endif %} - {% if can_edit_file_flag %} - -  {% endif %} -
    -
    -
    - {% if not galley.css_file %} -
    -
    - -
    - {% csrf_token %} -
    -
    -
    Upload CSS File
    - -

    - -
    -
    - -
    -
    -
    -     -
    -
    - {% endif %} -
    -
    - {% if xsl_files %} -
    -

    Typeset File XSLT

    -
    -
    -

    Select the XSL File used for rendering the HTML out of this file.

    -
    -
    -
    - {% csrf_token %} - - -
    -
    -
    -
    - {% endif %} - {% endif %} -
    - -{% endblock body %} diff --git a/src/typesetting/templates/typesetting/elements/actions.html b/src/typesetting/templates/typesetting/elements/actions.html deleted file mode 100644 index bd4f4a4a1e..0000000000 --- a/src/typesetting/templates/typesetting/elements/actions.html +++ /dev/null @@ -1,28 +0,0 @@ -
    - - {% if not round.has_completed_proofing and round.typesettingassignment %} - {{ round.typesettingassignment.friendly_status }}

    - {% else %} - {{ round.has_completed_proofing.count }} out of {{ round.galleyproofing_set.count }} proofing tasks completed.

     - {% if not round.typesettingassignment %} -
    This round has not had a typesetter assigned.

     - {% endif %} - {% endif %} - -
    - {% if round.has_completed_proofing %} - Request Corrections - {% elif round.typesettingassignment.reviewed and round.typesettingassignment.review_decision == 'corrections' %} - Request Corrections - {% endif %} - - {% if round.typesettingassignment and not round.typesettingassignment.reviewed %} - Review Typesetting - {% elif not round.typesettingassignment %} - Assign a - Typesetter - {% endif %} - Assign{% if round.galleyproofing_set.all %} More{% endif %} Proofreaders - -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/add_new_round.html b/src/typesetting/templates/typesetting/elements/add_new_round.html deleted file mode 100644 index a407412ffd..0000000000 --- a/src/typesetting/templates/typesetting/elements/add_new_round.html +++ /dev/null @@ -1,29 +0,0 @@ -
    -
    -
    -

     Add New Round

    -
    -
    -

    A new typesetting round will be started, allowing you to assign a new task to the typesetters.

    -
    - {% csrf_token %} - {% if pending_tasks %} -
    - Problems detected:

    -
      - {% for pending_task in pending_tasks %} -
    • {{ pending_task}}
      • - {% endfor %} -
    -

    Creating a new round will automatically cancel any open tasks. Assignees will be notified accordingly.

    -
    - {% endif %} - -
    -
    -
    - -
    diff --git a/src/typesetting/templates/typesetting/elements/author_tasks.html b/src/typesetting/templates/typesetting/elements/author_tasks.html deleted file mode 100644 index 80c380c8ef..0000000000 --- a/src/typesetting/templates/typesetting/elements/author_tasks.html +++ /dev/null @@ -1,3 +0,0 @@ -{% for task in author_proofing_tasks %} -Proofreading Task assigned on {{ task.assigned|date:"Y-m-d" }} -{% endfor %} diff --git a/src/typesetting/templates/typesetting/elements/card.html b/src/typesetting/templates/typesetting/elements/card.html deleted file mode 100644 index c64fc718a2..0000000000 --- a/src/typesetting/templates/typesetting/elements/card.html +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    -
    {{ article.pk }} - {{ article.title|safe }}
    -
    -
    - Article is undergoing typesetting and proofing. -
    - View Article -
    -
    -
    - {% include "elements/avatar.html" with user=article.correspondence_author role="Author" %} - - {% for assignment in article.editors %} - {% include "elements/avatar.html" with user=assignment.editor role=assignment.editor_type %} - {% endfor %} - -
    -
    \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/elements/choose_supp_file.html b/src/typesetting/templates/typesetting/elements/choose_supp_file.html deleted file mode 100644 index 52352412f4..0000000000 --- a/src/typesetting/templates/typesetting/elements/choose_supp_file.html +++ /dev/null @@ -1,30 +0,0 @@ -{% load foundation %} -
    -
    -
    -

     Select File as supplementary

    -
    -
    -
    - {% if error %} - - {% endif %} - - -
    - {% csrf_token %} -
    -
    - {{ supp_choice_form|foundation }} - -
    -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/complete_typesetting.html b/src/typesetting/templates/typesetting/elements/complete_typesetting.html deleted file mode 100644 index f1df24422b..0000000000 --- a/src/typesetting/templates/typesetting/elements/complete_typesetting.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load static %} - -
    -
    -
    -

     Complete Typesetting

    -
    -
    - {% if next_element %} -

    Complete Typesetting stage and move the article into {{ next_element|capfirst }}.

    - {% else %} -

    Complete the typesetting stage. This is the final element in your workflow.

    - {% endif %} - {% if pending_tasks %} -

    This action will cancel any open tasks. Assignees will be notified accordingly.

    -
    - Problems detected:

    -
      - {% for pending_task in pending_tasks %} -
    • {{ pending_task}}
      • - {% endfor %} -
    -
    - {% endif %} -
    - {% csrf_token %} - -
    -
    -
    - -
    diff --git a/src/typesetting/templates/typesetting/elements/dashboard.html b/src/typesetting/templates/typesetting/elements/dashboard.html deleted file mode 100644 index dc10e2863b..0000000000 --- a/src/typesetting/templates/typesetting/elements/dashboard.html +++ /dev/null @@ -1,34 +0,0 @@ -{% load roles %} -{% load role_count %} -{% user_has_role request 'typesetter' as typesetter %} -{% user_has_role request 'proofreader' as proofreader %} -{% user_has_role request 'editor' as editor %} -{% user_has_role request 'production' as production %} - -{% typesetting_tasks_count as num_typesetting_tasks %} -{% proofreading_tasks_count as num_proofreading_tasks %} -{% articles_in_stage_count as num_articles_in_stage %} - -
    -
    -
    -

    Typesetting Plugin

    -
    -
    - {% if production or editor %} -

    - There are currently {{ element.articles.count }} articles in the Typesetting stage. -

    - {% elif is_author or proofreader %} -

    - Any proofreading tasks you are assigned can be accessed using the button below. -

    - {% endif %} -
    - {% if editor or production %}There {% if num_articles_in_stage == 1 %}is{% else %}are{% endif %} {{ num_articles_in_stage }} article{% if num_articles_in_stage != 1 %}s{% endif %} in Typesetting{% endif %} - {% if typesetter %}You have {{ num_typesetting_tasks }} Typesetting task{% if num_typesetting_tasks != 1 %}s{% endif %}{% endif %} - {% if proofreader or is_author %}You have {{ num_proofreading_tasks }} Proofreading task{% if num_proofreading_tasks != 1 %}s{% endif %}{% endif %} -
    -
    -
    -
    \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/elements/data_fig_files.html b/src/typesetting/templates/typesetting/elements/data_fig_files.html deleted file mode 100644 index 992af17891..0000000000 --- a/src/typesetting/templates/typesetting/elements/data_fig_files.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - {% for file in article.data_figure_files.all %} - - - - - - - - {% endfor %} -
    LabelFilenameTypeModified
    {{ file.label }}{{ file.original_filename }}Figure/Data{{ file.last_modified|date:"Y-m-d G:i" }} 
    \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/elements/file_list.html b/src/typesetting/templates/typesetting/elements/file_list.html deleted file mode 100644 index e2ba32d606..0000000000 --- a/src/typesetting/templates/typesetting/elements/file_list.html +++ /dev/null @@ -1,79 +0,0 @@ -{% load files %} - -
    - {% if checkboxes %} - {% include "admin/core/widgets/select_all.html" %} - {% endif %} - - - - - {% if checkboxes %} - - {% endif %} - - - - - - - {% if options %} - {% if request.user.is_staff or user_is_editor %} - - {% endif %} - {% endif %} - - - - {% for file in files %} - - - {% if checkboxes %} - - {% endif %} - - - - - - - {% if options %} - {% if request.user.is_staff or user_is_editor %} - - {% endif %} - {% endif %} - - {% endfor %} - -
    IDSelectLabelFilenameTypeModifiedOwnerDownloadOptions
    {{ file.pk }} - - - {{ file.label }}{{ file.original_filename|truncatechars:40 }}{% file_type article file %}{{ file.last_modified }}{{ file.owner }}
    {{ file.owner.email }}    		 - -   - - - Options -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/galleys.html b/src/typesetting/templates/typesetting/elements/galleys.html deleted file mode 100644 index de31d79c67..0000000000 --- a/src/typesetting/templates/typesetting/elements/galleys.html +++ /dev/null @@ -1,88 +0,0 @@ -{% load files %} -{% load securitytags %} -{% load static %} -{% load render_string %} -{% load bool_fa %} - - - - - - - - - - - - - - - {% if request.user.is_admin %} - - {% endif %} - - {% for galley in galleys %} - {% can_edit_file galley.file galley.article as user_can_edit_file %} - - - - - - - - - - - - - {% if request.user.is_admin %} - {% endif %} - - {% empty %} - - - - {% endfor %} -
    IDLabelFilenamePublicModifiedEditDownloadHistoryPreviewFiguresDeleteAdmin
    {{ galley.pk }}{{ galley.label }}{{ galley.file.original_filename|truncatechars:40 }}{{ galley.public|bool_fa }}{{ galley.file.last_modified|date:"Y-m-d G:i" }} - -   - - {% if user_can_edit_file %} -  {% endif %} - - -   - - - {% if galley.file.mime_type in galley.mimetypes_with_figures and galley.has_missing_image_files %} - Missing Figures - {% else %} - N/a - {% endif %} - -
    - {% csrf_token %} - -
    -     		 Edit in Admin -
    No typeset files have been uploaded.
    - -{% if not disable_upload %} -
    - - - Upload New Typeset File - -
    - {% include "typesetting/elements/new_galley.html" %} -{% endif %} diff --git a/src/typesetting/templates/typesetting/elements/galleys_with_help_text.html b/src/typesetting/templates/typesetting/elements/galleys_with_help_text.html deleted file mode 100644 index 894b2471e7..0000000000 --- a/src/typesetting/templates/typesetting/elements/galleys_with_help_text.html +++ /dev/null @@ -1,5 +0,0 @@ -

    Any galleys (typeset files) that were selected by the editor - for correction, or that you originally uploaded, will appear here. Ensure - that any image files that belong with XML files are uploaded using the - upload images function and not as typeset files.

    -{% include "typesetting/elements/typesetter/galleys.html" with disable_upload=disable_upload %} \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/elements/new_galley.html b/src/typesetting/templates/typesetting/elements/new_galley.html deleted file mode 100644 index 52d9e213ff..0000000000 --- a/src/typesetting/templates/typesetting/elements/new_galley.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load foundation %} - -
    -
    -
    -

     Upload Typeset File

    -
    -
    -
    - {% if error %} - - {% endif %} - - -

    Plain text files (eg. HTML and XML) should be saved in the UTF-8 Format.

    - -
    - {% csrf_token %} -
    - {{ galley_form|foundation }} - -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/new_production_file.html b/src/typesetting/templates/typesetting/elements/new_production_file.html deleted file mode 100644 index 2f46864305..0000000000 --- a/src/typesetting/templates/typesetting/elements/new_production_file.html +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    -
    -

     New File for Typesetting

    -
    -
    -
    - {% if error %} - - {% endif %} - - -
    - {% csrf_token %} - -

    Use this form to upload a new file for typesetting.

    -
    -
    - - - -
    -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/no_typesetter.html b/src/typesetting/templates/typesetting/elements/no_typesetter.html deleted file mode 100644 index d4fa79a7ec..0000000000 --- a/src/typesetting/templates/typesetting/elements/no_typesetter.html +++ /dev/null @@ -1,24 +0,0 @@ -
    -
    -

    Assign a Typesetter

    -
    -

    This article does not have an assigned typesetter. If the article needs to be typeset, you can assign an external typesetter here. If your article is already typeset and ready for publication, you can load the typeset files here, and if needed, assign a proofreader to check them in the next step.

    - Assign a - Typesetter -
    - -
    -
    -

    Assign a Proofreader

    -
    - - {% if galleys %} -

    If your article doesn’t need a typesetter, and you’ve already loaded in the typeset files below, you can assign a proofreader to check your typeset files here.

    - Assign a - Proofreader - {% else %} -

    You must either request a typesetter upload typeset files or upload them yourself below before you can assign a proofreader.

    - - {% endif %} -
    \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/elements/production_files.html b/src/typesetting/templates/typesetting/elements/production_files.html deleted file mode 100644 index 86b4ea98d0..0000000000 --- a/src/typesetting/templates/typesetting/elements/production_files.html +++ /dev/null @@ -1,47 +0,0 @@ -{% comment %} -Deprecated. Use file_list.html instead. -{% endcomment %} - -
    -
    -

    Files for Typesetting

    - Upload File -
    -
    -

    - Listed below are all the manuscripts, copyedited files and corrections for this paper. Typesetters will also get access to all figure files uploaded by the author. If you need to manage these files use the Document Management page. If you need to upload a newer version use the Upload File button in the top right of this box. -

    - - - - - - - - - - - {% for key, list in manuscript_files.items %} - {% for file in list %} - - - - - - - - - - {% endfor %} - {% endfor %} -
    IDLabelFilenameTypeModifiedDownloadMake typeset file
    {{ file.pk }}{{ file.label }}{{ file.original_filename|truncatechars:40 }}{{ key }}{{ file.last_modified|date:"Y-m-d G:i" }} -   - Options
    -
    -
    -{% for key, list in manuscript_files.items %} - {% for file in list %} - {% include "typesetting/elements/transform_modal.html" with article=article file=file request=request %} - {% endfor %} -{% endfor %} diff --git a/src/typesetting/templates/typesetting/elements/proofing.html b/src/typesetting/templates/typesetting/elements/proofing.html deleted file mode 100644 index 11162e4d32..0000000000 --- a/src/typesetting/templates/typesetting/elements/proofing.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load bool_fa %} -{% for proofing in round.galleyproofing_set.all %} -
    -
    - Edit in Admin -

    Proofreader #{{ forloop.counter }}: {{ proofing.proofreader.full_name }}  

    -
    - - - - - - - - - - - - - - - - - - - - - -
    IDCreatedManagerNotifiedDueCompletedStatus
    {{ proofing.pk }}{{ proofing.assigned }}{{ proofing.manager.full_name }}{{ proofing.notified|bool_fa }} {% if not proofing.notified %}  {% endif %}{{ proofing.due|date:"Y-m-d" }}{% if proofing.completed %}{{ proofing.completed }}{% else %}{{ proofing.completed|bool_fa }}{% endif %}{{ proofing.status|capfirst }}Manage
    -
    -{% endfor %} diff --git a/src/typesetting/templates/typesetting/elements/proofing_file.html b/src/typesetting/templates/typesetting/elements/proofing_file.html deleted file mode 100644 index b8fe9b2c9c..0000000000 --- a/src/typesetting/templates/typesetting/elements/proofing_file.html +++ /dev/null @@ -1,24 +0,0 @@ -
    -
    -
    -

     Proofreading File Upload

    -
    -
    -
    - {% if error %} - - {% endif %} - -

    Select the file you would like to upload.

    - - -
    -
    - -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/proofreader_list.html b/src/typesetting/templates/typesetting/elements/proofreader_list.html deleted file mode 100644 index a872fc60b1..0000000000 --- a/src/typesetting/templates/typesetting/elements/proofreader_list.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - {% for proofreader in proofreaders %} - - - - - - {% empty %} - - - - {% endfor %} - -
    SelectNameEmail Address
    - - {{ proofreader.full_name }}{{ proofreader.email }}
    No suitable proofreaders.
    diff --git a/src/typesetting/templates/typesetting/elements/sidebar.html b/src/typesetting/templates/typesetting/elements/sidebar.html deleted file mode 100644 index d7296ae95c..0000000000 --- a/src/typesetting/templates/typesetting/elements/sidebar.html +++ /dev/null @@ -1,62 +0,0 @@ -
    -
    -

    Production Manager

    -
    -
    -

    - - {% if article.typesettingclaim %} - {{ article.typesettingclaim.editor.full_name }} is managing - the typesetting stage for this article. - {% if article.typesettingclaim.editor == request.user %} - Release Claim.{% endif %} - {% else %} - No one is managing typesetting for this article, - claim. - {% endif %} - -

    -
    -
    -

    Help

    -
    -
    -

    - - To typeset an article for publication, complete the following steps: - -

    - -
      -
    1. Assign a typesetter.
      2. -
    2. Review the uploaded files.
      3. -
    3. If required, assign proofreader.
      4. -
    4. If required, ask the typesetter to make corrections.
      5. -
    5. Repeat steps 1-4 until no further changes are needed.
      6. -
    6. Once you’re happy with the final version, click ‘Typesetting complete’ to move the article to pre-publication.
      7. -
    -     -

    - - As long as there are typeset files assigned, you can complete the - typesetting stage at any point. - -

    -
    -
    -
    -
    -

    Actions

    -
    -
    - -
    -
    -{% include "typesetting/elements/complete_typesetting.html" %} -{% include "typesetting/elements/add_new_round.html" %} diff --git a/src/typesetting/templates/typesetting/elements/supp_file_doi.html b/src/typesetting/templates/typesetting/elements/supp_file_doi.html deleted file mode 100644 index 37e31c1d40..0000000000 --- a/src/typesetting/templates/typesetting/elements/supp_file_doi.html +++ /dev/null @@ -1,25 +0,0 @@ -
    -
    -
    -

     Mint DOI for Supplementary file #{{ supp_file.pk }}: {{ supp_file.label }}

    -
    -
    -
    -
    - {% if supp_file.file.article.get_doi %} -
    - {% csrf_token %} -

    Article DOI: {{ supp_file.file.article.get_doi }}

    - - - -
    - {% else %} -
    - This article doesn't have a DOI. It must have a DOI before you can register a DOI for supplementary files -
    - {% endif %} -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/supp_file_label.html b/src/typesetting/templates/typesetting/elements/supp_file_label.html deleted file mode 100644 index aa7411a2d5..0000000000 --- a/src/typesetting/templates/typesetting/elements/supp_file_label.html +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    -
    -

     Mint DOI for Supplementary file #{{ supp_file.pk }}: {{ supp_file.label }}

    -
    -
    -
    -
    -
    - {% csrf_token %} - - - - -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/supplementary_files.html b/src/typesetting/templates/typesetting/elements/supplementary_files.html deleted file mode 100644 index cce4cd8284..0000000000 --- a/src/typesetting/templates/typesetting/elements/supplementary_files.html +++ /dev/null @@ -1,61 +0,0 @@ -{% load files %} -{% load securitytags %} -{% load static %} -{% load render_string %} - - - - - - - - - - - - {% for supp in article.supplementary_files.all %} - {% can_edit_file supp.file supp.article as user_can_edit_file %} - - - - - - - - - - {% empty %} - - - - {% endfor %} -
    IDLabelFilenameModifiedDownloadHistoryDOI
    {{ supp.pk }} - {{ supp.label }} -   - {{ supp.file.original_filename|truncatechars:40 }}{{ supp.file.last_modified|date:"Y-m-d G:i" }} -   - - {% if user_can_edit_file %} -  {% endif %} - - {% if supp.doi %} - {{ supp.doi }} -   - {% else %} - Mint DOI - {% endif %} -
    No supplementary files have been uploaded.
    - -
    - -  Choose from article documents - -  Upload a Supplementary File -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/title_sub.html b/src/typesetting/templates/typesetting/elements/title_sub.html deleted file mode 100644 index 97ca067236..0000000000 --- a/src/typesetting/templates/typesetting/elements/title_sub.html +++ /dev/null @@ -1,3 +0,0 @@ -#{{ article.pk }} -/ {{ article.correspondence_author.last_name }} -/ {{ article.safe_title }} diff --git a/src/typesetting/templates/typesetting/elements/transform_modal.html b/src/typesetting/templates/typesetting/elements/transform_modal.html deleted file mode 100644 index f0ca76a2b5..0000000000 --- a/src/typesetting/templates/typesetting/elements/transform_modal.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load hooks %} -
    -
    -
    -

    Generate typeset file for #{{ file.pk }}: {{ file.original_filename|truncatechars:40 }} ({{file.label}})

    -
    -
    - - - - - - - - - -
    EngineDescriptionTransform
    ----- Transforming this file will make it available for article readers to download.Convert - {% hook 'conversion_row' file article %} -
    -
    -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter.html b/src/typesetting/templates/typesetting/elements/typesetter.html deleted file mode 100644 index e770b083d9..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter.html +++ /dev/null @@ -1,38 +0,0 @@ -{% load bool_fa %} - -{% if round.typesettingassignment %} -
    -
    - {% if request.user.is_staff %}Edit in Admin{% endif %} -

    Typesetter: {{ round.typesettingassignment.typesetter.full_name }}  

    -
    - - - - - - - - - - - {% if round.typesettingassignment.reviewed %} - - {% endif %} - - - - - - - - - - {% if round.typesettingassignment.reviewed %} - - {% endif %} - -
    IDCreatedManagerTypesetter NotifiedDueCompletedStatusManage
    {{ round.typesettingassignment.pk }}{{ round.typesettingassignment.assigned }}{{ round.typesettingassignment.manager.full_name }}{{ round.typesettingassignment.notified|bool_fa }} - {% if not round.typesettingassignment.notified %}   Notify them{% endif %}{{ round.typesettingassignment.due|date:"Y-m-d" }}{% if round.typesettingassignment.completed %}{{ round.typesettingassignment.completed }}{% else %}{{ round.typesettingassignment.completed|bool_fa }}{% endif %}{{ round.typesettingassignment.status|capfirst }}Manage
    -
    -{% endif %} diff --git a/src/typesetting/templates/typesetting/elements/typesetter/agreement.html b/src/typesetting/templates/typesetting/elements/typesetter/agreement.html deleted file mode 100644 index 5092b803cc..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/agreement.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load foundation %} - -

    Below you can accept or decline this task and write a note to the manager.

    - -{% include "admin/elements/forms/errors.html" with form=form %} - -
    - {% csrf_token %} - {{ form.note|foundation }} - - -
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter/files.html b/src/typesetting/templates/typesetting/elements/typesetter/files.html deleted file mode 100644 index 51e25388d8..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/files.html +++ /dev/null @@ -1,40 +0,0 @@ -{% comment %} -This template is deprecated. Use elements/file_list.html instead. -{% endcomment %} - -{% load securitytags %} -{% load files %} - - - - - - - - - - {% for file in assignment.files_to_typeset.all %} - - - - - - - - {% endfor %} - {% for file in article.data_figure_files.all %} - - - - - - - - {% endfor %} -
    LabelFilenameTypeModified
    {{ file.label }}{{ file.original_filename }}MS{{ file.last_modified|date:"Y-m-d G:i" }} -   -
    {{ file.label }}{{ file.original_filename }}Figure/Data{{ file.last_modified|date:"Y-m-d G:i" }} -   -
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter/galleys.html b/src/typesetting/templates/typesetting/elements/typesetter/galleys.html deleted file mode 100644 index 45a1aa667d..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/galleys.html +++ /dev/null @@ -1,61 +0,0 @@ -{% load files %} -{% load roles %} -{% load securitytags %} -{% load static %} -{% load render_string %} - - - - - - - - - - - - - {% for galley in galleys %} - {% can_view_file galley.file as can_view_file_flag %} - {% can_edit_file galley.file article as can_edit_file_flag %} - {% can_view_file_history galley.file article as can_view_file_history_flag %} - {% user_has_role request 'typesetter' as user_is_typesetter %} - - - - - - - - - - {% empty %} - - - - {% endfor %} -
    IDLabelFilenameModifiedEditDownloadPreviewFigures
    {{ galley.pk }}{{ galley.label }}{{ galley.file.original_filename|truncatechars:40 }}{{ galley.file.last_modified|date:"Y-m-d G:i" }} - Edit -   - - -   - - - {% if galley.file.mime_type in galley.mimetypes_with_figures and galley.has_missing_image_files %} - Missing Figures - {% else %} - N/a - {% endif %} -
    No typeset files have been uploaded.
    - -{% if not disable_upload %} -
    - - - Upload New Typeset File - -
    -{% endif %} diff --git a/src/typesetting/templates/typesetting/elements/typesetter/info.html b/src/typesetting/templates/typesetting/elements/typesetter/info.html deleted file mode 100644 index 5c514609d1..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/info.html +++ /dev/null @@ -1,28 +0,0 @@ -

    Typesetting Task

    -
    - {{ assignment.task|safe|default:"

    No task details were provided.

    "|safe }} -
    -

    Comments from Proofreaders

    -{% if assignment.display_proof_comments and assignment.proofing_assignments_for_corrections.exists %} - {% include "typesetting/elements/view_proofreading_comments.html" %} -{% else %} -

    No comments to show.

    -{% endif %} - -

    Other Details

    - - - - - - - - - - - - - -
    IDCreatedManagerDue
    {{ assignment.pk }}{{ assignment.assigned }}{{ assignment.manager.full_name }}  {{ assignment.due }}
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter/metadata.html b/src/typesetting/templates/typesetting/elements/typesetter/metadata.html deleted file mode 100644 index 0e4c1dafec..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/metadata.html +++ /dev/null @@ -1,209 +0,0 @@ -{% load settings %} -{% load roles %} -{% load static %} - -{% user_has_role request 'editor' as user_is_editor %} -{% user_has_role request 'production' as user_is_production %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if journal_settings.general.submission_summary %} - - - - - - - {% endif %} - {% if journal_settings.general.submission_competing_interests %} - - - - - - - {% endif %} - - - - - - - - - - {% for field_answer in article.fieldanswer_set.all %} - - - - - - - {% endfor %} - -
    - Title -
    {{ article.title|safe }}
    SectionLicenceLanguage
    {{ article.section.name }}{{ article.license.short_name }}{{ article.get_language_display }}
    SubmittedAccepted
    {{ article.date_submitted }}{{ article.date_accepted }}
    Abstract
    {{ article.abstract|safe }}
    Keywords
    {% for keyword in article.keywords.all %}{{ keyword }}{% if not forloop.last %}, {% endif %}{% empty %}No keywords recorded{% endfor %}
    Non Specialist Summary
    - {% if article.competing_interests %}{{ article.non_specialist_summary|safe }} - {% else %} - No Summary Supplied - {% endif %} -
    Competing Interests
    - {% if article.competing_interests %}{{ article.competing_interests }}{% else %}No CI{% endif %}
    Peer Reviewed?
    - This article has {{ article.completed_reviews_with_decision.count }} completed reviews. -
    - {% if article.peer_reviewed %}This article has been marked as having been reviewed in the metadata{% else %}This article has not been marked as having been reviewed. If this article has completed reviews above this may be incorrect.{% endif %} -
    {{ field_answer.field.name }}
    {{ field_answer.answer }}
    - -{% if article.frozenauthor_set.all %} -
    -

    Authors

    -
    - - - - - - - - - {% for f_author in article.frozenauthor_set.all %} - - - - - - - - {% endfor %} -
    NameEmailInstitutionCountryPrimary?
    {{ f_author.full_name }}{% if f_author.author.email %}{{ f_author.author.email }}  {% else %}No email address recorded.{% endif %}{% if f_author.department %}{{ f_author.department }}, {% endif %}{{ f_author.institution }}{{ f_author.country }}{% if f_author.author == article.correspondence_author %} - - {% else %}{% endif %} -
    -{% endif %} - -
    -

    Editors

    -
    - - - - - - - {% for assignment in article.editors %} - - - - - - {% empty %} - - - - {% endfor %} -
    NameEmailType
    {{ assignment.editor.full_name }}{{ assignment.editor.email }}  {{ assignment.editor_type|capfirst }}
    No users assigned
    - - -
    -

    Issue

    -
    -
    - {% if article.issue or article.projected_issue %} - - - - - - - - - - - {% if article.issue %} - - - - - - {% elif article.projected_issue %} - - - - - - {% endif %} - -
    Issue IDIssue TitleVolumeNumberPublished
    {{ article.issue.id }}{{ article.issue.issue_title }}{{ article.issue.volume }}{{ article.issue.issue }}{{ article.issue.date }}{{ article.projected_issue.id }}{{ article.projected_issue.issue_title }}{{ article.projected_issue.volume }}{{ article.projected_issue.issue }}{{ article.projected_issue.date }}
    - {% else %} -

    This article does not have a projected issue. Please contact the Editor or Manager to get an issue for this paper.

    - {% endif %} -
    - - - -
    -

    Identifiers

    -
    -{% setting_var request.journal 'use_crossref' as use_crossref %} -
    - - - - - - - - - - {% if use_crossref %} - - {% with article.get_doi as doi %} - {% if doi %} - - - {% else %} - - - {% endif %} - {% endwith %} - - {% endif %} -
    ID TypeIdentifier
    ID{{ article.pk }}
    DOI{{ doi }}Example DOI Based on Pattern{{ article.render_sample_doi }}
    -
    - diff --git a/src/typesetting/templates/typesetting/elements/typesetter/source_files.html b/src/typesetting/templates/typesetting/elements/typesetter/source_files.html deleted file mode 100644 index f3993c3194..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/source_files.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load static %} -{% load render_string %} - - - - - - - - {% for source_file in article.source_files.all %} - - - - - - {% empty %} - - - - {% endfor %} -
    IDFilenameUploadedDownload
    {{ source_file.pk }}{{ source_file.original_filename|truncatechars:40 }}{{ source_file.last_modified|date:"Y-m-d G:i" }} -   -
    No source files have been uploaded.
    - -
    - - - Upload New Source File - -
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter/supplementary_files.html b/src/typesetting/templates/typesetting/elements/typesetter/supplementary_files.html deleted file mode 100644 index 0d8802bb13..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter/supplementary_files.html +++ /dev/null @@ -1,25 +0,0 @@ -{% load static %} -{% load render_string %} - - - - - - - - {% for supp_file in supplementary_files %} - - - - - - {% empty %} - - - - {% endfor %} -
    IDLabelDOIDownload
    {{ supp_file.pk }}{{ supp_file.label|truncatechars:40 }}{{ supp_file.doi }} -   -
    No supplementary files have been shared by the editor.
    -
    diff --git a/src/typesetting/templates/typesetting/elements/typesetter_list.html b/src/typesetting/templates/typesetting/elements/typesetter_list.html deleted file mode 100644 index eb85cbb1b5..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetter_list.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - {% for typesetter in typesetters %} - - - - - - - {% empty %} - - - - - - - {% endfor %} - -
    SelectNameEmail AddressActive Typesetting Tasks
    {{ typesetter.full_name }}{{ typesetter.email }}{{ typesetter.active_typesets|length }}
    No suitable typesetters.
    diff --git a/src/typesetting/templates/typesetting/elements/typesetting_assignment_fields.html b/src/typesetting/templates/typesetting/elements/typesetting_assignment_fields.html deleted file mode 100644 index 31eb944e7e..0000000000 --- a/src/typesetting/templates/typesetting/elements/typesetting_assignment_fields.html +++ /dev/null @@ -1,83 +0,0 @@ -{% load settings %} -{% load foundation %} -{% load static %} - -
    -
    -

    1. Select a Typesetter

    -
    -
    -

    Who will you invite to complete this assignment?

    - {% include "typesetting/elements/typesetter_list.html" with typesetters=typesetters %} -
    -
    -
    -
    -

    2. Select Files

    - -   - Document Management - (opens in new tab) - -
    -
    -

    Which files will the typesetter need to access during this - round of typesetting?

    - {% include "typesetting/elements/file_list.html" with checkboxes=True files=files input_name="files_to_typeset" %} - {% if galleys %} -
    - Which existing galleys need to be corrected? - {% include "admin/core/widgets/select_all.html" %} - {{ form.galleys_to_correct }} -
    - {% endif %} -
    -
    -
    -
    -

    3. Set a Due Date

    -
    -
    -

    When will the assignment be due?

    - {% include "admin/core/widgets/soon_date_buttons.html" with date_input_id=form.due.id_for_label input_type="date" %} - {{ form.due|foundation }} -
    -
    -
    -
    -

    4. Define the Task

    -
    -
    - Typesetting Guide - [ - Edit - ] - -
    - {% setting_var request.journal 'typesetting_guide' as typesetting_guide %} - {{ typesetting_guide|safe }} -
    -
    -
    - {% if proofing_assignments %} -

    Should the typesetter see the comments from proofreaders?

    - {{ form.display_proof_comments|foundation }} - {% include "typesetting/elements/view_proofreading_comments.html" %} -
    -

    Note: if proofreaders uploaded any files that typesetters should see, - you must give typesetters access to them in the files section - above.

    -
    - {% endif %} -
    -
    -

    Are there any other instructions for the typesetter?

    - {{ form.task|foundation }} -
    -
    diff --git a/src/typesetting/templates/typesetting/elements/view_proofreading_comments.html b/src/typesetting/templates/typesetting/elements/view_proofreading_comments.html deleted file mode 100644 index b9ef39863d..0000000000 --- a/src/typesetting/templates/typesetting/elements/view_proofreading_comments.html +++ /dev/null @@ -1,23 +0,0 @@ -{% for proof in proofing_assignments %} -
    -
    - - Comments from {{ proof.proofreader }} ({{ proof.proofreader.email }}) - -
    - {{ proof.notes|safe|default:"

    No comments were provided.

    "|safe }} -

    Associated files:

    -
      - {% for file in proof.annotated_files.all %} -
    • - {{ file.original_filename }} - (file #{{ file.pk }}) -
      • - {% empty %} -
    • None
      • - {% endfor %} -
    -
    -
    -
    -{% endfor %} diff --git a/src/typesetting/templates/typesetting/index.html b/src/typesetting/templates/typesetting/index.html deleted file mode 100644 index 4dcf56a9cc..0000000000 --- a/src/typesetting/templates/typesetting/index.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "admin/core/base.html" %} - -{% block title %}Typesetting plugin{% endblock title %} -{% block title-section %}Typesetting Plugin is installed{{ galley.pk }}{% endblock %} - -{% block breadcrumbs %} - {{ block.super }} -{% endblock breadcrumbs %} - - -{% block body %} -
    -

    The Typesetting plugin is currently installed.

    -

    - To get started with the plugin, make sure it is enabled as part of your - journal's configured workflow -

    -

    - This plugin is inteded to replace the original production and proofing workflow elements -

    -
    -{% endblock body %} diff --git a/src/typesetting/templates/typesetting/notify_typesetter.html b/src/typesetting/templates/typesetting/notify_typesetter.html deleted file mode 100644 index 100043ce86..0000000000 --- a/src/typesetting/templates/typesetting/notify_typesetter.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load static %} - -{% block title %}Notify Typesetter{% endblock title %} -{% block title-section %}Notify Typesetter{% endblock %}} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Assign Typesetter
    • -
  • Notify Typesetter
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -

    4. Notify the Typesetter

    -
    -
    -

    You can send a message to the typesetter or skip it.

    -
    -
    - {% csrf_token %} -
    -

    To {{ assignment.typesetter.full_name }} {{ assignment.typesetter.email }}

    -
    From {{ request.user.full_name }} {{ request.user.email }}
    -
    -
    -

    Subject: {{ journal_settings.email_subject.subject_typesetting_notify_typesetter}}

    - - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -{% endblock body %} - -{% block js %} - {% include "elements/jqte.html" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/preview_embedded.html b/src/typesetting/templates/typesetting/preview_embedded.html deleted file mode 100644 index 0b5afea3dd..0000000000 --- a/src/typesetting/templates/typesetting/preview_embedded.html +++ /dev/null @@ -1,76 +0,0 @@ -{% load static %} - - - - - - PDF Proofing - - - - - - -
    -
    -
    - - - - \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/typesetting_article.html b/src/typesetting/templates/typesetting/typesetting_article.html deleted file mode 100644 index 4f557c4bb0..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_article.html +++ /dev/null @@ -1,125 +0,0 @@ -{% extends "admin/core/base.html" %} - -{% block title %}Typesetting Article #{{ article.pk }}{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -

    Typesetting Article #{{ article.pk }}

    -
    -
    - -
    - {% for round in rounds %} -
    - {% if not round.typesettingassignment and not round.galleyproofing_set.exists %} - {% include "typesetting/elements/no_typesetter.html" %} - {% else %} - {% include "typesetting/elements/typesetter.html" %} - {% include "typesetting/elements/proofing.html" %} - {% if forloop.first %}{% include "typesetting/elements/actions.html" %}{% endif %} - {% endif %} -
    - {% endfor %} -
    -
    -
    - -
    -
    -

    Files for Typesetting

    -
    -
    -

    - Listed below are all the files that may be needed - in typesetting, including reference files like - pre-existing galleys and proofing files. - You can manage these files with Document - Management in the Actions box. -

    - {% include "typesetting/elements/file_list.html" with files=files options=True %} -
    -
    - -
    -
    -

    Current Galleys

    -
    -
    -

    - Any typeset files (a.k.a. galleys) that have been - uploaded either by editors or typesetters are listed - below. All files below will be downloadable by article - readers, so ensure that only the final ready-to-publish - files are included. -

    - {% include "typesetting/elements/galleys.html" %} -
    -
    - -
    -
    -

    Optional Files

    -
    -
      -
    • -

      Supplementary files

       -
      -

      - Data files that should be made available to the reader as a download link. You can also register a DOI for these files if you have DOI registration enabled - (HTML/XML figures are always available for download and don't need to be added as supplementary files) -

      - {% include "typesetting/elements/supplementary_files.html" %} -
      -
      • -
    • -

      Source Files

       -
      -

      - Source Files are intermediate files uploaded by the typesetter, that are used to generate the final Typeset files (e.g. Adobe In Design files used to generate the PDF). - Uploading these files (where available) is important in case any changes need to be made to the article in the future. -

      - {% include "typesetting/elements/typesetter/source_files.html" %} - -
      -
    -
    - -
    -
    - {% include "typesetting/elements/sidebar.html" %} -
    - - {% for file in files %} - {% include "typesetting/elements/transform_modal.html" with article=article file=file request=request %} - {% endfor %} - {% include "elements/production/source_files_upload.html" %} - {% include "elements/production/new_supp_file.html" %} - {% include "typesetting/elements/choose_supp_file.html" %} - {% include "typesetting/elements/new_production_file.html" %} - {% include "admin/elements/summary_modal.html" %} - {% for supp_file in article.supplementary_files.all %} - {% include "typesetting/elements/supp_file_doi.html" with supp_file=supp_file %} - {% include "typesetting/elements/supp_file_label.html" with supp_file=supp_file %} - {% endfor %} - -{% endblock body %} - -{% block js %} - {% include "elements/datatables.html" with target="#file_list" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_articles.html b/src/typesetting/templates/typesetting/typesetting_articles.html deleted file mode 100644 index 3ee93bf1a6..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_articles.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "admin/core/base.html" %} - -{% block title %}Articles in Typesetting{% endblock %} - -{% block breadcrumbs %} -{{ block.super }} -{% include "typesetting/breadcrumbs/typesetting_base.html" %} -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -

    Articles in Typesetting

    - {% if filter == 'me' %}All Submissions{% else %}My Assignments{% endif %} -
    -
    - - - - - - - - - - - - - - - - {% for article in articles_in_typesetting %} - - - - - - - - - - - - {% empty %} - - - - {% endfor %} - -
    IDTitleSubmittedMain AuthorEditorsSectionProjected IssueProduction Manager
    {{ article.pk }}{{ article.safe_title }}{{ article.date_submitted }}{{ article.correspondence_author.full_name }}{% for editor in article.editors %}{{ editor.editor.full_name }}{% if not forloop.last %}, {% endif %}{% endfor %}{{ article.section.name }}{% if article.projected_issue %}{{ article.projected_issue.display_title }}{% else %}None{% endif %}{% if article.typesettingclaim %}{{ article.typesettingclaim.editor.full_name }}{% else %}Claim Article{% endif %}View
    No articles in this stage
    -
    -
    -
    - -{% endblock body %} - -{% block js %} -{% include "elements/datatables.html" with target="#unassigned" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_assign_proofreader.html b/src/typesetting/templates/typesetting/typesetting_assign_proofreader.html deleted file mode 100644 index a53b30edb8..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_assign_proofreader.html +++ /dev/null @@ -1,74 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load foundation %} -{% load static %} - -{% block title %}Assign Proofreader{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Assign Proofreader
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -

    Assign Proofreader to {{ article.title|safe }}

    - Enrol a Proofreader -
    -
    - {% include "elements/forms/errors.html" %} -

    Select a proofreader below. They will have access to the following typeset files:

    -
      - {% for galley in galleys %} -
    • {{ galley.id }} - {{ galley.label }} ({{ galley.file.original_filename }})
      • - {% endfor %} -
    -
    -
    -
    - {% csrf_token %} -
    - -
    -

    1. Select a Proofreader

    -
    -
    - {% include "typesetting/elements/proofreader_list.html" with proofreader=proofreaders %} -
    - -
    -

    2. Set a Due Date

    -
    -
    - {{ form.due|foundation }} -
    - -
    -

    3. Define a Task

    -
    -
    - {{ form.task|foundation }} -
    - - - -
    -
    - - {% if form.modal %} - {% include "admin/elements/confirm_modal.html" with modal=form.modal form_id="assign_proofreader" %} - {% endif %} - -{% endblock %} - -{% block js %} - {% if form.modal %} - {% include "admin/elements/open_modal.html" with target=form.modal.id %} - {% endif %} - {% include "elements/datatables.html" with target="#typesetter" %} - -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_assignment.html b/src/typesetting/templates/typesetting/typesetting_assignment.html deleted file mode 100644 index c1c2f4f803..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_assignment.html +++ /dev/null @@ -1,143 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load bool_fa %} -{% load static %} -{% load foundation %} -{% load settings %} - -{% block title %}Typesetting Article #{{ article.pk }}{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} -
  • Typesetting Assignments
    • -
  • Typesetting {{ assignment.round.article.title|safe }}
    • -{% endblock breadcrumbs %} - -{% block body %} -
    - - -
    -
    -
    -

    Assignment Information

    -
    -

    - {{ article.safe_title }} [Skip to full metadata] -

    -
    -

    Typesetting Guide

    -
    - {% setting_var request.journal 'typesetting_guide' as typesetting_guide %} - {{ typesetting_guide|safe }} -
    -
    -
    - {% include "typesetting/elements/typesetter/info.html" %} -
    - {% if not assignment.completed and not assignment.accepted and not assignment.cancelled %} -
    - {% include "typesetting/elements/typesetter/agreement.html" %} -
    - {% endif %} -
    -

    Files to Use

    -
    -
    -

    The following files have been selected - for use or reference when - generating the typeset articles.

    - {% include "typesetting/elements/file_list.html" with files=assignment.files_to_typeset.all input_name="files_to_typeset" %} -
    - {% if supplementary_files %} -
    -

    Supplementary Files

    -
    -
    -

    The Editor has uploaded the following Supplementary files

    - {% include "typesetting/elements/typesetter/supplementary_files.html" %} -
    - {% endif %} - {% if not assignment.cancelled %} -
    -

    Upload Galleys

    -
    -
    - {% include "typesetting/elements/galleys_with_help_text.html" %} -
    -
    -

    Upload Source Files

    -
    -
    -

    Source Files are intermediate files used to generate the final Typeset files (e.g. Adobe In Design files)

    - {% include "typesetting/elements/typesetter/source_files.html" %} - -
    - {% endif %} -
    -
    -
    -

    Complete Typesetting

    -
    -
    - {% if assignment.cancelled %} -

    The editor has cancelled this typesetting task. No further changes can be made now

    - {% else %} - {% if pending_corrections %} -
    -

    Some typeset files have not been corrected yet

    -
      - {% for correction in pending_corrections %} -

    • {{ correction.galley }} - {{ correction.galley.file }}

      • - {% endfor %} -
    -

    You can edit to the typeset file by hitting 'Edit' on the typeset file, then you can upload a correction

    -
    - {% endif %} - {% if missing_images %} -
    -

    Some typeset files don't have their images uploaded

    -
      - {% for galley in missing_images %} -

    • {{ galley }} - {{ galley.file }}

      • - {% endfor %} -
    -

    You can add images to the typeset file by hitting 'Edit'. A menu will show you which images are missing

    -
    - {% endif %} - - -
    - {% csrf_token %} -

    Once you are happy with the typeset files, - you can mark this stage as complete, with an optional note.

    - {{ complete_form|foundation }} - -
    - {% endif %} -
    -
    -
    - -
    -
    -
    -

    Metadata

    -
    -
    - {% include "typesetting/elements/typesetter/metadata.html" %} -
    -
    -
    -
    - - - {% include "typesetting/elements/new_galley.html" with assignment=assignment %} - {% include "elements/production/source_files_upload.html" %} -{% endblock body %} - - -{% block js %} - -{% endblock %} diff --git a/src/typesetting/templates/typesetting/typesetting_assignments.html b/src/typesetting/templates/typesetting/typesetting_assignments.html deleted file mode 100644 index e60ff46a55..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_assignments.html +++ /dev/null @@ -1,74 +0,0 @@ -{% extends "admin/core/base.html" %} - -{% block title %}Typesetting Assignments{% endblock %} - -{% block breadcrumbs %} -{{ block.super }} -
  • Typesetting Assignments
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -

    Your Typesetting Assignments

    -
    -
    - - - - - - - - - - - {% for assignment in active_assignments %} - - - - - - - - - - {% endfor %} -
    IDTitleRoundAssignedDueTime to Due
    {{ assignment.pk }}{{ assignment.round.article.title|safe }}{{ assignment.round }}{{ assignment.assigned }}{{ assignment.due|date:"Y-m-d" }}{{ assignment.time_to_due }}View Assignment
    -
    -
    - -
    -
    -

    Past Typesetting Assignments

    -
    -
    - - - - - - - - - {% for assignment in past_assignments %} - - - - - - - - {% endfor %} -
    IDTitleRoundAssignedCompleted/Cancelled
    {{ assignment.pk }}{{ assignment.round.article.title|safe }}{{ assignment.round }}{{ assignment.assigned }}{% if assignment.completed %}Completed: {{ assignment.completed }}{% else %}Cancelled: {{ assignment.cancelled }}{% endif %}
    -
    -
    -
    - -{% endblock body %} - -{% block js %} -{% include "elements/datatables.html" with target="#tasks" %} - {% include "elements/datatables.html" with target="#completed_tasks" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_manage_proofing_assignment.html b/src/typesetting/templates/typesetting/typesetting_manage_proofing_assignment.html deleted file mode 100644 index 2f0ef4c7de..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_manage_proofing_assignment.html +++ /dev/null @@ -1,183 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load foundation %} -{% load bool_fa %} -{% load static %} - - -{% block title %}Proofing Article #{{ article.pk }}{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Reviewing Proofing Assignment #{{ assignment.pk }}
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -
    -

    {{ assignment.proofreader.full_name }}'s Proofing Assignment

    - Edit in Admin -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    IDCreatedManagerNotifiedDueAcceptedCompleted
    {{ assignment.pk }}{{ assignment.assigned }}{{ assignment.manager.full_name }}{{ assignment.notified|bool_fa }}{{ assignment.due }}{% if assignment.accepted %}{{ assignment.accepted }}{% else %} - {{ assignment.accepted|bool_fa }}{% endif %}{% if assignment.completed %}{{ assignment.completed }}{% else %} - {{ assignment.completed|bool_fa }}{% endif %}
    Current Status
    - {{ assignment.friendly_status }} -
    -
    -
    -
    - -
    -
    -
    -

    Manage Proofing Assignment

    -
    -
    - {% if assignment.status == 'assigned' %} -
    - {% csrf_token %} - {% include "admin/elements/forms/errors.html" with form=form %} - - {{ form|foundation }} - - - {% else %} -

    - This assignment has been accepted, completed or cancelled and cannot now be edited. -

    - {% endif %} -
    -
    - {% if not assignment.status == 'cancelled' and not assignment.completed %} -
    -

    Cancel Assignment

    -
    -
    -
    - {% csrf_token %} -

    - You can cancel this assignment at any time. A note will be sent to the proofreader. -

    - -
    -
    -
    -

    Complete Assignment

    -
    -
    -
    - {% csrf_token %} -

    - You can mark this task as completed on behalf of the proofreader. - Note: the proofreader will no longer have access to the proofreading interface. -

    - -
    -
    - {% endif %} - {% if assignment.status == 'cancelled' or assignment.completed and not assignment.accepted %} -
    -

    Reset Assignment

    -
    -
    -

    If this assignment has been accidentally declined or cancelled prematurely you can reset the - assignment here.

    -
    - {% csrf_token %} -

    - You can cancel this assignment at any time. A note will be sent to the proofreader. -

    - -
    -
    - {% endif %} -
    -
    -
    -
    -
    -

    Results

    -
    -
    -

    Once the assignment is completed, the proofreader's response will be available below for you to review.

    -
    - {% if assignment.status == 'completed' %} -
    -

    Typeset Files Proofed

    -
    -
    -
      - {% for galley in assignment.proofed_files.all %} -
    • {{ galley }}
      • - {% endfor %} -
    -
    - -
    -

    Notes

    -
    -
    - {{ assignment.notes|safe|linebreaksbr }} -

    -
    - -
    -

    Files

    -
    -
    -

    - Files uploaded by the proofreader. -

    - {% for file in assignment.annotated_files.all %} -
  • {{ file }}
    • - {% endfor %} -
    - {% elif assignment.status == 'cancelled' %} -

    - This assignment was cancelled. -

    - {% else %} -

    - This assignment has not been completed. -

    - {% endif %} -
    -
    -
    - -{% endblock body %} - -{% block js %} -{% include "elements/jqte.html" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_notify_proofreader.html b/src/typesetting/templates/typesetting/typesetting_notify_proofreader.html deleted file mode 100644 index a85c571274..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_notify_proofreader.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load static %} - -{% block title %}Notify Proofreader{% endblock title %} -{% block title-section %}Notify Proofreader{% endblock %}} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Assign Proofreader
    • -
  • Notify Proofreader
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -

    4. Notify the Proofreader

    -
    -
    -

    You can send a message to the proofreader or skip it.

    -
    -
    - {% csrf_token %} -
    -

    To {{ assignment.proofreader.full_name }} {{ assignment.proofreader.email }}

    -
    From {{ request.user.full_name }} {{ request.user.email }}
    -
    -
    -

    Subject: {{ journal_settings.email_subject.subject_typesetting_notify_proofreader }}

    - - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -{% endblock body %} - -{% block js %} - {% include "elements/jqte.html" %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_proofing_assignments.html b/src/typesetting/templates/typesetting/typesetting_proofing_assignments.html deleted file mode 100644 index 7379ca4ba1..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_proofing_assignments.html +++ /dev/null @@ -1,70 +0,0 @@ -{% extends "admin/core/base.html" %} - -{% block title %}Proofreading Assignments{% endblock %} - -{% block breadcrumbs %} -{{ block.super }} -
  • Proofreading Assignments
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -

    Your Open Proofreading Assignments

    -
    -
    -

    This is your proofing assignment list.

    - - - - - - - - - - {% for assignment in active_assignments %} - - - - - - - {% if not assignment.completed %} - - {% endif %} - - {% endfor %} -
    IDTitleAssignedDueTime to Due
    {{ assignment.pk }}{{ assignment.round.article.title|safe }}{{ assignment.assigned }}{{ assignment.due|date:"Y-m-d" }}{{ assignment.time_to_due }}View Assignment
    -
    -
    -

    Your Closed Proofreading Assignments

    -
    -
    - - - - - - - - {% for assignment in completed_assignments %} - - - - - - - {% endfor %} -
    IDTitleAssignedCompleted
    {{ assignment.pk }}{{ assignment.round.article.title|safe }}{{ assignment.assigned }}{{ assignment.completed }}
    -
    -
    -
    - -{% endblock body %} - -{% block js %} -{% include "elements/datatables.html" with target="#tasks" %} - {% include "elements/datatables.html" with target="#completed_tasks" %} -{% endblock js %} \ No newline at end of file diff --git a/src/typesetting/templates/typesetting/typesetting_proofreading_assignment.html b/src/typesetting/templates/typesetting/typesetting_proofreading_assignment.html deleted file mode 100644 index a827c34a4b..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_proofreading_assignment.html +++ /dev/null @@ -1,133 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load foundation %} -{% load i18n %} - -{% block title %}Proofreading Assignments{% endblock %} - -{% block breadcrumbs %} - {{ block.super }} -
  • Proofreading Assignments
    • -
  • Proofreading {{ assignment.round.article.title|safe }}
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -

    Proofreading {{ assignment.round.article.title|safe }}

    -
    -
    - {{ journal_settings.general.typesetting_proofreader_guidelines|safe }} -

    Notes from the editors:

    - {{ assignment.task|safe }} - - -

    -

    Editors: {% for editor_assignment in assignment.round.article.editors %} - {{ editor_assignment.editor.full_name }} - - {{ editor_assignment.editor.email }}{% if not forloop.last %}, {% endif %}{% endfor %}

    -
    -
    - -
    -
    -
    -

    Files for Proofreading

    -
    -
    -

    For XML or HTML files, we recommend you use the View File button to see what the file - will look like.

    - - - - - - - - {% for galley in galleys %} - - - - - - - {% endfor %} -
    LabelFilenameView FileDownload File
    {{ galley.label }}{% if galley in assignment.proofed_files.all %} - {% endif %}{{ galley.file.original_filename }} View File - Download File
    -
    -
    - {% csrf_token %} -
    -

    Notes

    -
    -
    -

    Please add any extra notes for the typesetter below, ensuring that you follow the guidelines - above.

    - - {{ form.notes|foundation }} - -
    -
    -

    Files

    -
    -
    -

    You can upload any annotated files, notes or documents here.

    - - - - - {% if proofing_manager %} - {% endif %} - - {% for file in assignment.annotated_files.all %} - - - - {% if proofing_manager %} - {% endif %} - - {% empty %} - - - - {% endfor %} -
    LabelFilenameDownload
    {{ file.label }}{{ file.original_filename }} 
    No files have been uploaded yet.
    - - - - - -
    - -
    -

    Finishing Up

    -
    -
    -

    When you have completed your notes and uploaded any annotated files, you can mark this task as complete using the button below. Note: Once you mark this task as complete you will not be able to return to this page.

    - -
    -
    -
    -
    -
    - - {% if form.modal %} - {% include "admin/elements/confirm_modal.html" with modal=form.modal form_id="typesetting_proofreading" %} - {% endif %} - -{% endblock body %} - -{% block js %} - {% if form.modal %} - {% include "admin/elements/open_modal.html" with target=form.modal.id %} - {% endif %} -{% endblock js %} diff --git a/src/typesetting/templates/typesetting/typesetting_review_assignment.html b/src/typesetting/templates/typesetting/typesetting_review_assignment.html deleted file mode 100644 index 07c1ab0778..0000000000 --- a/src/typesetting/templates/typesetting/typesetting_review_assignment.html +++ /dev/null @@ -1,178 +0,0 @@ -{% extends "admin/core/base.html" %} -{% load foundation %} -{% load bool_fa %} -{% load static %} - - -{% block title %}Typesetting Article #{{ article.pk }}{% endblock %} -{% block title-sub %} - {% include 'typesetting/elements/title_sub.html' %} -{% endblock title-sub %} - -{% block breadcrumbs %} - {{ block.super }} - {% include "typesetting/breadcrumbs/typesetting_base.html" %} -
  • Reviewing Assignment #{{ assignment.pk }}
    • -{% endblock breadcrumbs %} - -{% block body %} -
    -
    -
    -
    -

    Typesetting worked on - by {{ assignment.typesetter.full_name }}

    - < - Back -
    -
    - - - - - - - - - - - - - - - - - - - -
    IDManagerCreatedDueAcceptedCompletedStatus
    {{ assignment.pk }}{{ assignment.manager.full_name }}{{ assignment.assigned|date }}{{ assignment.due|date }}{{ assignment.accepted|date }}{% if assignment.completed %} - {{ assignment.completed|date }}{% else %} - {{ assignment.completed|bool_fa }}{% endif %}{{ assignment.status|capfirst }}
    -
    -
    -

    Typesetting Task

    -
    -
    - {{ assignment.task|safe|default:"No typesetting task was recorded." }} -
    - {% if assignment.accepted %} -
    -

    Note from Typesetter

    -
    -
    - {{ assignment.typesetter_note|safe|default:"No typesetter note was recorded." }} -
    - {% endif %} -
    -
    -
    - -
    -
    -
    -
    -

    Files

    -
    -
    -

    These are the files that the typesetter was given access to during this round of typesetting.

    - {% include "typesetting/elements/file_list.html" with files=assignment.files_to_typeset.all input_name="files_to_typeset" %} -
    -
    - {% include "typesetting/elements/galleys_with_help_text.html" with disable_upload="y" %} -
    -
    -
    -
    - -
    -
    -
    -
    -

    Manage Assignment

    -
    -
    -
    - {% csrf_token %} - {% include "elements/forms/errors.html" %} - {% if not assignment.accepted and not assignment.declined %} - {% include 'typesetting/elements/typesetting_assignment_fields.html' %} - - - {% elif assignment.accepted and assignment.completed and not assignment.reviewed %} - {% if pending_corrections %} -
    -

    The typesetter has not made any changes to some typeset files

    -
      - {% for correction in pending_corrections %} - {% if correction.galley %} -

    • {{ correction.galley }} - {{ correction.galley.file }}

      • - {% else %} -

    • A file with label {{ correction.label }} has been deleted, if this is not expected, check that the typesetter has uploaded a new file Dismiss

      • - {% endif %} - {% endfor %} -
    -
    - - {% endif %} -
    -

    Now that the typesetter has completed their task you can review the uploaded typeset files and make a decision about next steps. The typeset files for this article are listed below.

    -
    -
    - {{ decision_form }} - -
    -
    - -

    There are three possible decisions to finish a Typesetting assignment.

    -
      -
    • Accept - Finishes this typesetting round.
      • -
    • Corrections Required - Finishes this typesetting round so you can request further typesetting be done.
      • -
    • Proofing Required - Allows you to assign proofreaders who can provide feedback.
      • -
    -

    Please ensure you are ready to go ahead before making a decision.

    -     -
    -
    -
    - {% elif assignment.accepted and assignment.completed and assignment.reviewed %} -

    This assignment has been reviewed and the review decision was: {{ assignment.get_review_decision_display }}

    - {% elif assignment.accepted %} - This assignment can no longer be edited since it has been accepted by the typesetter - {% elif assignment.declined %} - - {% endif %} -
    -
    -
    -
    -
    - -
    -
    -
    -
    -

    Typeset Files

    -
    -
    - {% include "typesetting/elements/galleys.html" with disable_upload="y" %} -
    -
    -
    -
    - - {% if form.modal %} - {% include "admin/elements/confirm_modal.html" with modal=form.modal form_id="review_assignment" %} - {% endif %} - -{% endblock body %} - -{% block js %} - {% if form.modal %} - {% include "admin/elements/open_modal.html" with target=form.modal.id %} - {% endif %} - {% include "elements/datatables.html" with target="#typesetter #file_list" %} -{% endblock js %} diff --git a/src/typesetting/templatetags/__init__.py b/src/typesetting/templatetags/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/typesetting/templatetags/role_count.py b/src/typesetting/templatetags/role_count.py deleted file mode 100644 index 5af48960e0..0000000000 --- a/src/typesetting/templatetags/role_count.py +++ /dev/null @@ -1,38 +0,0 @@ -from django import template - -from plugins.typesetting import models, plugin_settings -from submission import models as submission_models - -register = template.Library() - - -@register.simple_tag(takes_context=True) -def typesetting_tasks_count(context): - request = context['request'] - return models.TypesettingAssignment.objects.filter( - typesetter=request.user, - round__article__journal=request.journal, - completed__isnull=True, - cancelled__isnull=True, - ).count() - - -@register.simple_tag(takes_context=True) -def proofreading_tasks_count(context): - request = context['request'] - return models.GalleyProofing.objects.filter( - round__article__journal=request.journal, - proofreader=request.user, - completed__isnull=True, - cancelled=False, - ).count() - - -@register.simple_tag(takes_context=True) -def articles_in_stage_count(context): - request = context['request'] - - return submission_models.Article.objects.filter( - journal=request.journal, - stage=plugin_settings.STAGE, - ).count() diff --git a/src/typesetting/templatetags/typesetting_file_permissions.py b/src/typesetting/templatetags/typesetting_file_permissions.py deleted file mode 100644 index 2cbbb35eb0..0000000000 --- a/src/typesetting/templatetags/typesetting_file_permissions.py +++ /dev/null @@ -1,11 +0,0 @@ -from django import template - -from plugins.typesetting import security - -register = template.Library() - - -@register.simple_tag(takes_context=True) -def can_manage_file(context, file_object): - request = context['request'] - return security.can_manage_file(request, file_object) \ No newline at end of file diff --git a/src/typesetting/test_galley.xml b/src/typesetting/test_galley.xml deleted file mode 100644 index 0f2014925a..0000000000 --- a/src/typesetting/test_galley.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - -
    - - - 0000-0000 - - Journal Title - - 0000-0000 - - Publisher Name - - - - 10.1234/test.1234 - - - Subject - - - - Article Title - - - - - Surname - Given Name - - email@example.org - 1 - - - Organization - - 01 - 01 - 2023 - - - 2023 - - 1 - 1 - 1 - 100 - - Copyright: © 2023 The Author(s) - 2023 - - This is an open-access article distributed under the terms of the Creative Commons Attribution 4.0 International License (CC-BY 4.0), which permits unrestricted use, distribution, and reproduction in any medium, provided the original author and source are credited. See http://creativecommons.org/licenses/by/4.0/. - - - - -

    Abstract

    -     -     -     - - - 1 Introduction -

    Introduction

    -     - - 2 Section Title -

    Para

    -     - - 7 Conclusion -

    Conclusion

    -     - - - -
    diff --git a/src/typesetting/tests.py b/src/typesetting/tests.py deleted file mode 100644 index 4d468dac0d..0000000000 --- a/src/typesetting/tests.py +++ /dev/null @@ -1,540 +0,0 @@ -__copyright__ = "Copyright 2017 Birkbeck, University of London" -__author__ = "Martin Paul Eve, Andy Byers & Mauro Sanchez" -__license__ = "AGPL v3" -__maintainer__ = "Birkbeck Centre for Technology and Publishing" - -from mock import Mock - -import os - -from django.test import TestCase -from django.utils import timezone -from django.http import HttpRequest -from django.core.exceptions import PermissionDenied -from django.core.files.base import ContentFile -from django.shortcuts import reverse -from django.conf import settings - -from plugins.typesetting import plugin_settings, models, security -from submission import models as submission_models -from utils import setting_handler -from utils.shared import clear_cache -from utils.testing import helpers -from core import models as core_models, urls -from core import files as core_files - -from bs4 import BeautifulSoup - - -class TestTypesetting(TestCase): - - @staticmethod - def mock_messages_add(level, message, extra_tags): - pass - - @staticmethod - def get_method(field): - return None - - @staticmethod - def prepare_request_with_user(user, journal, press=None): - """ - Build a basic request dummy object with the journal set to journal - and the user having editor permissions. - :param user: the user to use - :param journal: the journal to use - :return: an object with user and journal properties - """ - request = Mock(HttpRequest) - request.user = user - request.GET = Mock() - request.GET.get = TestTypesetting.get_method - request.journal = journal - request._messages = Mock() - request._messages.add = TestTypesetting.mock_messages_add - request.path = '/a/fake/path/' - request.path_info = '/a/fake/path/' - request.press = press - - return request - - def test_proofreader_for_article_required(self): - """ - Tests that an assigned user can pas this check - """ - func = Mock() - kwargs = {'assignment_id': self.galley_proofing.pk} - decorated_func = security.proofreader_for_article_required(func) - request = self.prepare_request_with_user( - self.proofreader, - self.journal_one, - ) - - decorated_func(request, **kwargs) - - self.assertTrue( - func.called, - "Security Error: Proofreader cannot access proofing task.", - ) - - def test_proofreader_for_article_required_bad_user(self): - """ - Tests a bad user cannot pass this check - """ - func = Mock() - kwargs = {'assignment_id': self.galley_proofing.pk} - decorated_func = security.proofreader_for_article_required(func) - request = self.prepare_request_with_user( - self.article_owner, - self.journal_one, - ) - - with self.assertRaises(PermissionDenied): - # test that editor_user_required raises a PermissionDenied exception - decorated_func(request, **kwargs) - - self.assertFalse( - func.called, - "Security Error: Priviledged user able to access prooding task." - ) - - - def test_require_not_notified(self): - """ - Tests that an assigned user can pas this check - """ - func = Mock() - kwargs = {'assignment_id': self.galley_proofing.pk} - decorator = security.require_not_notified(models.GalleyProofing) - request = self.prepare_request_with_user( - self.editor, - self.journal_one, - ) - - decorated_func = decorator(func) - decorated_func(request, **kwargs) - - self.assertTrue( - func.called, - "Security Error: Editor can't bypass require_not_notified.", - ) - - def test_require_not_notified_with_notifed_true(self): - """ - Tests that an assigned user can pas this check - """ - func = Mock() - kwargs = {'assignment_id': self.galley_proofing_notified.pk} - decorator = security.require_not_notified(models.GalleyProofing) - request = self.prepare_request_with_user( - self.editor, - self.journal_one, - ) - - decorated_func = decorator(func) - - with self.assertRaises(PermissionDenied): - decorated_func(request, **kwargs) - - self.assertFalse( - func.called, - "Security Error: Editor can bypass require_not_notified.", - ) - - def test_can_manage_file(self): - func = Mock() - kwargs = {'file_id': self.private_file.pk} - decorated_func = security.user_can_manage_file(func) - - users = [self.production_manager, self.editor] - - for user in users: - request = self.prepare_request_with_user( - self.production_manager, - self.journal_one, - ) - - decorated_func(request, **kwargs) - - self.assertTrue( - func.called, - "Security Error: Priviledged user cannot manage file." - ) - - def test_can_manage_file_bad_user(self): - func = Mock() - kwargs = {'file_id': self.private_file.pk} - decorated_func = security.user_can_manage_file(func) - - users = [self.typesetter, self.bad_user, self.proofreader] - - for user in users: - request = self.prepare_request_with_user( - self.typesetter, - self.journal_one, - ) - - with self.assertRaises(PermissionDenied): - # test that editor_user_required raises a PermissionDenied - # exception - decorated_func(request, **kwargs) - - self.assertFalse( - func.called, - "Security Error: Non priviledged user can manage file." - ) - - def test_good_user_can_preview_typesetting_article(self): - func = Mock() - kwargs = {'assignment_id': self.typesetting_assignment.pk} - decorated_func = security.can_preview_typesetting_article(func) - - self.typesetter.is_active = True - - request = self.prepare_request_with_user( - self.typesetter, - self.journal_one, - ) - decorated_func(request, **kwargs) - self.assertTrue( - func.called, - ) - - def test_bad_user_cant_preview_typesetting_article(self): - func = Mock() - kwargs = {'assignment_id': self.typesetting_assignment.pk} - decorated_func = security.can_preview_typesetting_article(func) - - request = self.prepare_request_with_user( - self.article_owner, - self.journal_one, - ) - with self.assertRaises(PermissionDenied): - decorated_func(request, **kwargs) - - def test_archive_stage_hides_task(self): - self.client.force_login(self.typesetter) - response = self.client.get( - reverse('typesetting_assignments') - ) - self.assertContains( - response, - 'Active Article', - ) - self.assertNotContains( - response, - 'Archived Article' - ) - - def test_archived_article_task_404s(self): - self.client.force_login(self.typesetter) - response = self.client.get( - reverse( - 'typesetting_assignment', - kwargs={ - 'assignment_id': self.archived_typesetting_task.pk - } - ) - ) - self.assertTrue( - response.status_code, - 404, - ) - - def test_active_article_task_200s(self): - self.client.force_login(self.typesetter) - response = self.client.get( - reverse( - 'typesetting_assignment', - kwargs={ - 'assignment_id': self.active_typesetting_task.pk - } - ) - ) - self.assertTrue( - response.status_code, - 200, - ) - - def build_proofing_comparison_dict(self, published, theme): - setting_handler.save_setting( - 'general', - 'journal_theme', - self.journal_one, - theme, - ) - clear_cache() - self.client.force_login(self.typesetter) - if published: - url = reverse( - 'article_view', - kwargs={ - 'identifier_type': 'id', - 'identifier': self.article_in_typesetting.pk, - } - ) - else: - url = reverse( - 'typesetting_preview_galley', - kwargs={ - 'article_id': self.article_in_typesetting.pk, - 'galley_id': self.galley.pk, - 'assignment_id': self.active_typesetting_task.pk, - } - ) - response = self.client.get(url) - soup = BeautifulSoup(response.content, 'html.parser') - data = [] - include_ids = [ - 'article_opener', - 'article_metadata', - 'content', # This quite generic id in the OLH theme - # predates this proofing test - 'author_biographies', - ] - exclude_ids = [ - 'article_how_to_cite', - 'article_date_published', - 'note_to_proofreader_1', - 'note_to_proofreader_2', - 'article_footer_block', - ] - for include_id in include_ids: - included_element = soup.find(id=include_id) - if not included_element: - continue - for exclude_id in exclude_ids: - excluded_element = included_element.find(id=exclude_id) - if not excluded_element: - continue - excluded_element.decompose() - data.append(included_element.prettify()) - return data - - def test_proof_matches_published_article_olh(self): - """ - Tests whether the metadata and article text offered - in proofing matches that of the published article. - """ - - self.maxDiff = None - proofing = self.build_proofing_comparison_dict(False, 'OLH') - stage_published = submission_models.STAGE_PUBLISHED - self.article_in_typesetting.stage = stage_published - self.article_in_typesetting.date_published = timezone.now() - self.article_in_typesetting.save() - published = self.build_proofing_comparison_dict(True, 'OLH') - self.article_in_typesetting.stage = plugin_settings.STAGE - self.article_in_typesetting.date_published = None - self.article_in_typesetting.save() - self.assertEqual(proofing, published) - - def test_proof_matches_published_article_material(self): - """ - Tests whether the metadata and article text offered - in proofing matches that of the published article. - """ - - self.maxDiff = None - proofing = self.build_proofing_comparison_dict(False, 'material') - stage_published = submission_models.STAGE_PUBLISHED - self.article_in_typesetting.stage = stage_published - self.article_in_typesetting.date_published = timezone.now() - self.article_in_typesetting.save() - published = self.build_proofing_comparison_dict(True, 'material') - self.article_in_typesetting.stage = plugin_settings.STAGE - self.article_in_typesetting.date_published = None - self.article_in_typesetting.save() - self.assertEqual(proofing, published) - - def test_proof_matches_published_article_clean(self): - """ - Tests whether the metadata and article text offered - in proofing matches that of the published article. - """ - - self.maxDiff = None - proofing = self.build_proofing_comparison_dict(False, 'clean') - stage_published = submission_models.STAGE_PUBLISHED - self.article_in_typesetting.stage = stage_published - self.article_in_typesetting.date_published = timezone.now() - self.article_in_typesetting.save() - published = self.build_proofing_comparison_dict(True, 'clean') - self.article_in_typesetting.stage = plugin_settings.STAGE - self.article_in_typesetting.date_published = None - self.article_in_typesetting.save() - self.assertEqual(proofing, published) - - @classmethod - def setUpTestData(self): - """ - Setup the test environment. - :return: None - """ - roles_to_setup = [ - "reviewer", - "editor", - "production", - "typesetter", - "proofreader", - ] - helpers.create_press() - self.journal_one, self.journal_two = helpers.create_journals() - helpers.create_roles(roles_to_setup) - - self.editor = helpers.create_editor(self.journal_one) - self.article_owner = helpers.create_regular_user() - self.bad_user = helpers.create_second_user(self.journal_one) - self.proofreader = helpers.create_user( - username='proofer@janeway.systems', - roles=['proofreader'], - journal=self.journal_one, - ) - - self.proofreader.is_active = True - self.proofreader.save() - - self.production_manager = helpers.create_user( - username='production_manager@janeway.systems', - roles=['production'], - journal=self.journal_one, - ) - self.typesetter = helpers.create_user( - username='typesetter@janeway.systems', - roles=['typesetter'], - journal=self.journal_one, - **{'first_name': 'Kat', 'last_name': 'Janeway', 'is_active': True} - ) - - self.typesetter.is_active = True - self.typesetter.save() - - - self.article_in_typesetting = submission_models.Article.objects.create( - owner=self.article_owner, - title="A Test Article", - abstract="An abstract", - stage=plugin_settings.STAGE, - journal_id=self.journal_one.id - ) - - self.private_file = core_models.File.objects.create( - mime_type="A/FILE", - original_filename="blah.txt", - uuid_filename="UUID.txt", - label="A file that is private", - description="Oh yes, it's a file", - owner=self.article_owner, - is_galley=False, - privacy="owner", - article_id=self.article_in_typesetting.pk - ) - - self.workflow_element = core_models.WorkflowElement.objects.create( - journal=self.journal_one, - element_name='Typesetting Plugin', - handshake_url='dummy', - jump_url='dummy', - stage=plugin_settings.STAGE, - article_url=True, - ) - - self.workflow_log_entry = core_models.WorkflowLog.objects.create( - article=self.article_in_typesetting, - element=self.workflow_element, - ) - - self.typesetting_round = models.TypesettingRound.objects.create( - article=self.article_in_typesetting, - ) - - self.typesetting_assignment = models.TypesettingAssignment.objects.create( - round=self.typesetting_round, - manager=self.editor, - typesetter=self.typesetter, - due=timezone.now(), - ) - - self.test_file_name = 'test_galley.xml' - self.test_file_path = os.path.join( - settings.BASE_DIR, - 'plugins', - 'typesetting', - self.test_file_name, - ) - - with open(self.test_file_path, 'rb') as test_file: - content_file = ContentFile(test_file.read()) - content_file.name = self.test_file_name - self.galley_file = core_files.save_file_to_article( - content_file, - self.article_in_typesetting, - self.typesetter - ) - - self.galley, created = core_models.Galley.objects.get_or_create( - article=self.article_in_typesetting, - label='XML', - type='xml', - defaults={'file': self.galley_file}, - ) - - self.galley_proofing = models.GalleyProofing.objects.create( - round=self.typesetting_round, - manager=self.editor, - proofreader=self.proofreader, - due=timezone.now(), - ) - - self.galley_proofing_notified = models.GalleyProofing.objects.create( - round=self.typesetting_round, - manager=self.editor, - proofreader=self.proofreader, - due=timezone.now(), - notified=True, - ) - - self.author = helpers.create_user( - 'author@janeway.systems', - ['author'], - journal=self.journal_one, - ) - self.author.is_active = True - self.author.save() - self.active_article = helpers.create_article( - journal=self.journal_one, - ) - self.active_article.title = 'Active Article' - self.active_article.save() - self.active_article.authors.add(self.author) - self.archived_article = helpers.create_article( - journal=self.journal_one, - ) - self.archived_article.stage = submission_models.STAGE_ARCHIVED - self.archived_article.title = 'Archived Article' - self.archived_article.save() - self.archived_article.authors.add(self.author) - - self.active_typesetting_round = models.TypesettingRound.objects.create( - article=self.active_article, - ) - self.active_typesetting_task = models.TypesettingAssignment.objects.create( - round=self.active_typesetting_round, - manager=self.editor, - typesetter=self.typesetter, - task='Active Task', - ) - - self.archived_typesetting_round = models.TypesettingRound.objects.create( - article=self.archived_article, - ) - self.archived_typesetting_task = models.TypesettingAssignment.objects.create( - round=self.archived_typesetting_round, - manager=self.editor, - typesetter=self.typesetter, - task='Archived Task', - ) - - @classmethod - def tearDownClass(cls): - cls.galley.unlink_files() diff --git a/src/typesetting/urls.py b/src/typesetting/urls.py deleted file mode 100644 index 1ede3ae6b6..0000000000 --- a/src/typesetting/urls.py +++ /dev/null @@ -1,136 +0,0 @@ -from django.urls import re_path - -from plugins.typesetting import views - -urlpatterns = [ - re_path(r'^manager/$', - views.typesetting_manager, - name='typesetting_manager' - ), - re_path(r'^$', - views.typesetting_articles, - name='typesetting_articles' - ), - re_path(r'^article/(?P\d+)/makegalley/file/(?P\d+)/$', views.article_file_make_galley, - name='typesetting_article_file_make_galley'), - re_path(r'^article/(?P\d+)/$', - views.typesetting_article, - name='typesetting_article' - ), - re_path(r'^article/(?P\d+)/typesetter/(?P\d+)/review/$', - views.typesetting_review_assignment, - name='typesetting_review_assignment' - ), - re_path(r'^article/(?P\d+)/action/(?Pclaim|unclaim)$', - views.typesetting_claim_article, - name='typesetting_claim_article' - ), - re_path(r'^article/(?P\d+)/galley/(?P\d+)/edit/$', - views.typesetting_edit_galley, - name='typesetting_edit_galley' - ), - re_path(r'^article/(?P\d+)/galley/upload/$', - views.typesetting_upload_galley, - name='typesetting_upload_galley' - ), - re_path(r'^correction/(?P\d+)/delete/$', - views.typesetting_delete_correction, - name='typesetting_delete_correction', - ), - re_path(r'^article/(?P\d+)/galley/upload/$', - views.typesetting_upload_galley, - name='typesetting_upload_galley' - ), - re_path(r'^article/(?P\d+)/assign/typesetter/$', - views.typesetting_assign_typesetter, - name='typesetting_assign_typesetter' - ), - re_path(r'^article/(?P\d+)/typesetter/(?P\d+)/notify/$', - views.typesetting_notify_typesetter, - name='typesetting_notify_typesetter' - ), - - re_path(r'^assignments/$', - views.typesetting_assignments, - name='typesetting_assignments' - ), - - re_path(r'^assignments/typesetting/(?P\d+)/$', - views.typesetting_assignment, - name='typesetting_assignment' - ), - re_path(r'^assignments/typesetting/(?P\d+)/download/(?P\d+)/$', - views.typesetting_typesetter_download_file, - name='typesetting_typesetter_download_file' - ), - re_path(r'^article/(?P\d+)/assignment/(?P\d+)/galley/upload/$', - views.typesetting_upload_galley, - name='typesetting_assignment_upload_galley' - ), - - re_path(r'^article/(?P\d+)/assign/proofreader/$', - views.typesetting_assign_proofreader, - name='typesetting_assign_proofreader' - ), - re_path(r'^article/(?P\d+)/assign/proofreader/(?P\d+)/notify/$', - views.typesetting_notify_proofreader, - name='typesetting_notify_proofreader' - ), - re_path(r'^article/(?P\d+)/proofreader/(?P\d+)/review/$', - views.typesetting_manage_proofing_assignment, - name='typesetting_manage_proofing_assignment' - ), - re_path(r'^assignments/proofreading/$', - views.typesetting_proofreading_assignments, - name='typesetting_proofreading_assignments' - ), - re_path(r'^assignments/proofreading/(?P\d+)/$', - views.typesetting_proofreading_assignment, - name='typesetting_proofreading_assignment' - ), - - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/assignment/(?P\d+)/$', - views.typesetting_preview_galley, - name='typesetting_preview_galley' - ), - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/$', - views.typesetting_preview_galley, - name='editor_preview_galley' - ), - - re_path(r'^preview/article/(?P\d+)/assignment/(?P\d+)/file/(?P\d+)/$', - views.typesetting_proofing_download, - name='typesetting_proofing_download' - ), - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/assignment/(?P\d+)/figures/(?P.*)$', - views.preview_figure, - name='proofreader_preview_figure' - ), - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/assignment/(?P\d+)/(?P.*)$', - views.preview_figure, - name='proofreader_preview_figure_b' - ), - - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/figures/(?P.*)$', - views.preview_figure, - name='typesetter_preview_figure' - ), - re_path(r'^preview_galley/article/(?P\d+)/galley/(?P\d+)/(?P.*)$', - views.preview_figure, - name='typesetter_preview_figure_b' - ), - - re_path(r'^article/(?P\d+)/file/(?P\d+)/download/$', - views.typesetting_download_file, - name='typesetting_download_file' - ), - - re_path(r'^galley/(?P\d+)/delete/$', - views.typesetting_delete_galley, - name='typesetting_delete_galley' - ), - re_path(r'^supp-file/(?P\d+)/doi/$', - views.mint_supp_doi, - name='typesetting_mint_supp_doi' - ), -] diff --git a/src/typesetting/views.py b/src/typesetting/views.py deleted file mode 100644 index 2ea84acb5d..0000000000 --- a/src/typesetting/views.py +++ /dev/null @@ -1,1515 +0,0 @@ -from django.shortcuts import render, get_object_or_404, redirect, reverse -from django.contrib import messages -from django.core.files.base import ContentFile -from django.http import Http404 -from django.views.decorators.http import require_POST -from django.utils import timezone -from django.core.exceptions import PermissionDenied, ValidationError -from django.contrib.auth.decorators import login_required -from django.db.models import Q - -from plugins.typesetting import plugin_settings, models, logic, forms, security -from plugins.typesetting.notifications import notify -from security import decorators -from submission import models as submission_models -from core import models as core_models, forms as core_forms, files -from production import logic as production_logic -from journal.views import article_figure -from journal import logic as journal_logic -from utils.logger import get_logger - -logger = get_logger(__name__) - - -@decorators.has_journal -@decorators.editor_user_required -def typesetting_manager(request): - template = 'typesetting/index.html' - context = {} - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_articles(request): - """ - Displays a list of articles in the Typesetting stage. - :param request: HttpRequest - :return: HttpResponse - """ - article_filter = request.GET.get('filter', None) - - articles_in_typesetting = submission_models.Article.objects.filter( - journal=request.journal, - stage=plugin_settings.STAGE, - ) - - if article_filter and article_filter == 'me': - articles_in_typesetting = articles_in_typesetting.filter( - typesettingclaim__editor=request.user, - ) - - template = 'typesetting/typesetting_articles.html' - context = { - 'articles_in_typesetting': articles_in_typesetting, - 'filter': article_filter, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_article(request, article_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - rounds = models.TypesettingRound.objects.filter(article=article) - galleys = core_models.Galley.objects.filter( - article=article, - ) - files = logic.get_typesetting_files(article) - supp_choice_form = forms.SupplementaryFileChoiceForm(article=article) - galley_form = forms.GalleyForm() - - if not rounds: - logic.new_typesetting_round(article, rounds, request.user) - messages.add_message( - request, - messages.INFO, - 'New typesetting round created.', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - if request.POST and "new-round" in request.POST: - logic.new_typesetting_round(article, rounds, request) - messages.add_message( - request, - messages.INFO, - 'New typesetting round created.', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - elif request.POST and "complete-typesetting" in request.POST: - return logic.complete_typesetting(request, article) - - elif request.POST and 'source' in request.POST: - for uploaded_file in request.FILES.getlist('source-file'): - production_logic.save_source_file( - article, - request, - uploaded_file, - ) - messages.add_message( - request, - messages.INFO, - 'Source files uploaded', - ) - elif request.POST and 'supp' in request.POST: - for uploaded_file in request.FILES.getlist('supp-file'): - label = request.POST.get('label', 'Supplementary File') - production_logic.save_supp_file( - article, request, uploaded_file, label) - messages.add_message( - request, - messages.INFO, - 'Supplementary file uploaded: %s' % label, - ) - - elif request.POST and 'choice-supp' in request.POST: - form = forms.SupplementaryFileChoiceForm(request.POST, article=article) - if form.is_valid(): - supp = form.save() - messages.add_message( - request, - messages.INFO, - 'Supplementary file created', - ) - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - elif request.POST and 'edit-label' in request.POST: - label = request.POST.get('edit-label', 'Supplementary File') - supp_file = get_object_or_404( - core_models.SupplementaryFile, - id=int(request.POST.get("supp-id", 0)), - ) - file_obj = supp_file.file - # Cope with file not having foreign key to article - if file_obj.article != article: - raise Http404() - file_obj.label = label - file_obj.save() - - messages.add_message( - request, - messages.INFO, - 'Label updated: %s' % label, - ) - - template = 'typesetting/typesetting_article.html' - context = { - 'article': article, - 'rounds': rounds, - 'galleys': galleys, - 'files': files, - 'pending_tasks': logic.typesetting_pending_tasks(rounds[0]), - 'next_element': logic.get_next_element('typesetting_articles', request), - 'supp_choice_form': supp_choice_form, - 'galley_form': galley_form, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_claim_article(request, article_id, action): - """ - Allows a PM or Editor to claim or unclaim an article. - :param request: HttpRequest - :param article_id: int, Article object PK - :param action: string, either claim or release - :return: HttpRedirect - """ - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - - if not hasattr(article, 'typesettingclaim'): - - models.TypesettingClaim.objects.get_or_create( - editor=request.user, - article=article, - ) - - messages.add_message( - request, - messages.SUCCESS, - 'Article claim successful.' - ) - - elif action == 'unclaim' and article.typesettingclaim.editor == request.user: - article.typesettingclaim.delete() - messages.add_message( - request, - messages.SUCCESS, - 'Article successfully released.', - ) - - else: - messages.add_message( - request, - messages.ERROR, - 'This article is already being managed by {}.'.format( - article.typesettingclaim.editor.full_name(), - ) - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - -@require_POST -@decorators.has_journal -@decorators.typesetting_user_or_production_user_or_editor_required -def typesetting_upload_galley(request, article_id, assignment_id=None): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - form = forms.GalleyForm(request.POST, request.FILES) - assignment = None - galley = None - - if assignment_id: - assignment = get_object_or_404( - models.TypesettingAssignment, - pk=assignment_id, - typesetter=request.user, - ) - - try: - if 'file' in request.FILES and form.is_valid(): - label = form.cleaned_data.get('label') - public = form.cleaned_data.get('public') - for uploaded_file in request.FILES.getlist('file'): - galley = production_logic.save_galley( - article, - request, - uploaded_file, - True, - label=label, - public=public, - ) - except TypeError as exc: - messages.add_message(request, messages.ERROR, str(exc)) - except UnicodeDecodeError: - messages.add_message(request, messages.ERROR, - "Uploaded file is not UTF-8 encoded") - except production_logic.ZippedGalleyError: - messages.add_message( - request, messages.ERROR, - "You tried to upload a compressed file. " - "Please upload each Typeset File separately", - ) - - if assignment and galley: - assignment.galleys_created.add(galley) - - if not galley: - messages.add_message( - request, - messages.WARNING, - 'No typeset file uploaded', - ) - - if not form.is_valid(): - messages.add_message( - request, - messages.WARNING, - 'Galley form not valid.', - ) - - if assignment: - return redirect( - reverse( - 'typesetting_assignment', - kwargs={'assignment_id': assignment.pk} - ) - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - -@decorators.has_journal -@decorators.typesetting_user_or_production_user_or_editor_required -def typesetting_edit_galley(request, galley_id, article_id): - """ - Allows a typesetter or editor to edit a Galley file. - :param request: HttpRequest object - :param galley_id: Galley object PK - :param article_id: Article PK, optional - :return: HttpRedirect or HttpResponse - """ - return_url = request.GET.get('return', None) - - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - galley = get_object_or_404( - core_models.Galley, - pk=galley_id, - article=article, - ) - galley_form = forms.GalleyForm( - instance=galley, - include_file=False, - ) - if galley.label == 'XML': - xsl_files = core_models.XSLFile.objects.all() - else: - xsl_files = None - - if request.POST: - - if 'delete' in request.POST: - - production_logic.handle_delete_request( - request, - galley, - article=article, - page="pm_edit", - ) - if not return_url: - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - else: - return redirect(return_url) - - label = request.POST.get('label') - - if 'fixed-image-upload' in request.POST: - if request.POST.get('datafile') is not None: - production_logic.use_data_file_as_galley_image( - galley, - request, - label, - ) - for uploaded_file in request.FILES.getlist('image'): - production_logic.save_galley_image( - galley, - request, - uploaded_file, - label, - fixed=True, - check_for_existing_images=True, - ) - - if 'image-upload' in request.POST: - for uploaded_file in request.FILES.getlist('image'): - production_logic.save_galley_image( - galley, - request, - uploaded_file, - label, - fixed=False, - check_for_existing_images=True, - ) - - elif 'css-upload' in request.POST: - for uploaded_file in request.FILES.getlist('css'): - production_logic.save_galley_css( - galley, - request, - uploaded_file, - 'galley-{0}.css'.format(galley.id), - label, - ) - - if 'galley-update' in request.POST: - galley_form = forms.GalleyForm( - request.POST, - instance=galley, - include_file=False, - ) - if galley_form.is_valid(): - galley_form.save() - - if 'replace-galley' in request.POST: - production_logic.replace_galley_file( - article, request, - galley, - request.FILES.get('galley'), - ) - - if 'xsl_file' in request.POST: - xsl_file = get_object_or_404(core_models.XSLFile, - pk=request.POST["xsl_file"]) - galley.xsl_file = xsl_file - galley.save() - - return_path = '?return={return_url}'.format( - return_url=return_url, - ) if return_url else '' - url = reverse( - 'typesetting_edit_galley', - kwargs={'article_id': article.pk, 'galley_id': galley_id}, - ) - redirect_url = '{url}{return_path}'.format( - url=url, - return_path=return_path, - ) - return redirect(redirect_url) - - template = 'typesetting/edit_galley.html' - context = { - 'galley': galley, - 'article': galley.article, - 'image_names': production_logic.get_image_names(galley), - 'return_url': return_url, - 'data_files': article.data_figure_files.all(), - 'galley_images': galley.images.all(), - 'xsl_files': xsl_files, - 'galley_form': galley_form, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_assign_typesetter(request, article_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - typesetters = logic.get_typesetters(request.journal) - rounds = models.TypesettingRound.objects.filter(article=article) - current_round = rounds[0] - if rounds.count() > 1: - previous_round = rounds[1] - proofing_assignments = previous_round.galleyproofing_set.filter( - completed__isnull=False, - cancelled=False, - ) - else: - previous_round = None - proofing_assignments = () - - files = logic.get_typesetting_files( - article, - previous_round=previous_round, - ) - galleys = article.galley_set.all() - initial_galleys_to_correct = [galley.pk for galley in galleys] - form = forms.TypesettingAssignmentForm( - typesetters=typesetters, - files=files, - rounds=rounds, - galleys=galleys, - initial_galleys_to_correct=initial_galleys_to_correct, - ) - - if request.POST: - form = forms.TypesettingAssignmentForm( - request.POST, - typesetters=typesetters, - files=files, - rounds=rounds, - galleys=galleys, - ) - - if form.is_valid() and form.is_confirmed(): - assignment = form.save() - assignment.manager = request.user - assignment.save() - - messages.add_message( - request, - messages.SUCCESS, - 'Assignment created.' - ) - - return redirect( - reverse( - 'typesetting_notify_typesetter', - kwargs={ - 'article_id': article.pk, - 'assignment_id': assignment.pk - } - ) - ) - - template = 'typesetting/assign_typesetter.html' - context = { - 'article': article, - 'typesetters': typesetters, - 'files': files, - 'galleys': galleys, - 'form': form, - 'round': current_round, - 'proofing_assignments': proofing_assignments, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -@security.require_not_notified(models.TypesettingAssignment) -def typesetting_notify_typesetter(request, article_id, assignment_id): - """ - Allows the Editor to send a notification email to the typesetter. - :param request: HttpRequest - :param article_id: Article object PK - :param assignment_id: TypesettingAssignment PK - :return: HttpResponse - """ - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - assignment = get_object_or_404( - models.TypesettingAssignment, - pk=assignment_id, - ) - - if assignment.notified: - messages.add_message( - request, - messages.WARNING, - 'A notification has already been sent for this assignment.' - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - if request.POST: - message = request.POST.get('message') - notify.event_typesetting_assignment( - request, - assignment, - message, - skip=True if 'skip' in request.POST else False, - ) - messages.add_message( - request, - messages.SUCCESS, - 'Assignment created.', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk} - ) - ) - - message = logic.get_typesetter_notification( - assignment, - article, - request, - ) - - template = 'typesetting/notify_typesetter.html' - context = { - 'article': article, - 'assignment': assignment, - 'message': message, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_review_assignment(request, article_id, assignment_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - - assignment = get_object_or_404( - models.TypesettingAssignment, - pk=assignment_id, - round__article=article, - ) - typesetters = logic.get_typesetters(request.journal) - files = logic.get_typesetting_files(article) - galleys = core_models.Galley.objects.filter( - article=assignment.round.article, - ) - rounds = models.TypesettingRound.objects.filter(article=article) - current_round = rounds[0] - initial_galleys_to_correct = [ - correction.galley.pk for correction in assignment.corrections.all() - ] - edit_form = forms.EditTypesettingAssignmentForm( - typesetters=typesetters, - files=files, - galleys=galleys, - rounds=rounds, - initial_galleys_to_correct=initial_galleys_to_correct, - instance=assignment, - ) - galley_form = forms.GalleyForm() - - decision_form = forms.ManagerDecision() - - if request.POST and ( - edit_form.CONFIRMABLE_BUTTON_NAME in request.POST - or edit_form.CONFIRMED_BUTTON_NAME in request.POST - ): - edit_form = forms.EditTypesettingAssignmentForm( - request.POST, - typesetters=typesetters, - files=files, - galleys=galleys, - rounds=rounds, - instance=assignment, - ) - - if edit_form.is_valid() and edit_form.is_confirmed(): - assignment = edit_form.save() - - assignment.manager = request.user - assignment.save() - - messages.add_message( - request, - messages.SUCCESS, - 'Assignment updated.' - ) - elif request.POST and "delete" in request.POST: - assignment.delete(request.user) - notify.event_typesetting_deleted( - assignment, - request, - ) - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - elif request.POST and "reopen" in request.POST: - assignment.reopen(request.user) - return redirect( - reverse( - 'typesetting_notify_typesetter', - kwargs={ - 'article_id': article.pk, - 'assignment_id': assignment.pk - } - ) - ) - - elif request.POST and "decision" in request.POST: - decision_form = forms.ManagerDecision( - request.POST, - instance=assignment, - ) - - if decision_form.is_valid(): - decision_form.save() - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - template = 'typesetting/typesetting_review_assignment.html' - context = { - 'article': article, - 'assignment': assignment, - 'galleys': galleys, - 'form': edit_form, - 'typesetters': typesetters, - 'files': files, - 'galley_form': galley_form, - 'proofing_assignments': assignment.proofing_assignments_for_corrections, - 'decision_form': decision_form, - 'pending_corrections': [ - correction for correction in assignment.corrections.all() - if not correction.corrected - ], - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.typesetter_user_required -def typesetting_assignments(request): - - assignments = models.TypesettingAssignment.active_objects.filter( - typesetter=request.user, - round__article__journal=request.journal, - ) - - active_assignments = assignments.filter( - completed__isnull=True, - cancelled__isnull=True, - ) - - past_assignments = assignments.filter( - Q(completed__isnull=False) | Q(cancelled__isnull=False), - ) - - template = 'typesetting/typesetting_assignments.html' - context = { - 'active_assignments': active_assignments, - 'past_assignments': past_assignments, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.typesetter_user_required -def typesetting_typesetter_download_file(request, assignment_id, file_id): - assignment = get_object_or_404( - models.TypesettingAssignment, - pk=assignment_id, - typesetter=request.user, - completed__isnull=True, - round__article__journal=request.journal, - ) - - file = get_object_or_404( - core_models.File, - pk=file_id, - article_id=assignment.round.article.pk, - ) - - if ( - file in assignment.files_to_typeset.all() - or file in assignment.round.article.data_figure_files.all() - or assignment.proofing_assignments_for_corrections().filter( - annotated_files__id=file_id) - or file.pk in assignment.round.article.supplementary_files.values_list( - 'file__pk', flat=True, - ) - or file.pk in assignment.round.article.galley_set.values_list( - 'file__pk', flat=True, - ) - ): - return files.serve_any_file( - request, - file, - path_parts=('articles', assignment.round.article.pk), - ) - else: - raise PermissionDenied( - 'You do not have permission to view this file.', - ) - - -@decorators.has_journal -@security.user_can_manage_file -def typesetting_download_file(request, article_id, file_id): - """ - A view that serves up a file for a given article. - """ - file = get_object_or_404( - core_models.File, - pk=file_id, - article_id=article_id, - ) - - return files.serve_any_file( - request, - file, - path_parts=('articles', article_id) - ) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_delete_galley(request, galley_id): - """ - Allows users with permission to delete files - """ - galley = get_object_or_404( - core_models.Galley, - pk=galley_id, - article__journal=request.journal, - ) - - # Grab the article and delete the Galley but retain the file. - article = galley.article - galley.delete() - - messages.add_message( - request, - messages.SUCCESS, - 'Galley deleted.', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs = {'article_id': article.pk}, - ) - ) - - -@decorators.has_journal -@decorators.typesetter_user_required -def typesetting_assignment(request, assignment_id): - assignment = get_object_or_404( - models.TypesettingAssignment.active_objects, - pk=assignment_id, - typesetter=request.user, - completed__isnull=True, - round__article__journal=request.journal - ) - article = assignment.round.article - - # Display galleys that were selected by the editor - # or that were uploaded by the typesetter - galleys = core_models.Galley.objects.filter( - Q(article=article), - (Q(file__files_to_typeset=assignment) | Q(file__owner=request.user)), - ).distinct() - - supplementary_files = article.supplementary_files.filter( - file__pk__in=[file.pk for file in assignment.files_to_typeset.all()], - ) - - form = forms.TypesetterDecision() - galley_form = forms.GalleyForm() - complete_form = core_forms.SimpleTinyMCEForm(field_name='note_from_typesetter') - complete_form.fields['note_from_typesetter'].required = False - - if request.POST: - if 'source' in request.POST: - for uploaded_file in request.FILES.getlist('source-file'): - production_logic.save_source_file( - article, - request, - uploaded_file, - ) - messages.add_message( - request, - messages.INFO, - 'Source files uploaded', - ) - - if assignment.cancelled: - messages.add_message( - request, - messages.WARNING, - 'The manager for this article has cancelled this typesetting' - 'task. No further changes are allowed', - ) - return redirect(reverse( - 'typesetting_assignment', - kwargs={'assignment_id': assignment.pk}, - )) - - if 'complete_typesetting' in request.POST: - note = request.POST.get('note_from_typesetter', None) - assignment.complete(note, request.user) - notify.event_complete_notification(assignment, request) - - return redirect(reverse('typesetting_assignments')) - - form = forms.TypesetterDecision(request.POST) - - if form.is_valid(): - note = form.cleaned_data.get('note', 'No note supplied.') - decision = form.cleaned_data.get('decision') - if decision == 'accept': - assignment.accepted = timezone.now() - assignment.save() - notify.event_decision_notification( - assignment, - request, - note, - decision, - ) - return redirect(reverse( - 'typesetting_assignment', - kwargs={'assignment_id': assignment.pk}, - )) - else: - assignment.completed = timezone.now() - for correction in assignment.corrections.all(): - if correction.corrected and not correction.date_completed: - correction.date_completed = timezone.now() - assignment.save() - notify.event_decision_notification( - assignment, - request, - note, - decision, - ) - messages.add_message( - request, - messages.INFO, - 'Thanks, the manager has been informed.' - ) - - return redirect(reverse('typesetting_assignments')) - - template = 'typesetting/typesetting_assignment.html' - context = { - 'assignment': assignment, - 'article': assignment.round.article, - 'form': form, - 'galleys': galleys, - 'pending_corrections': [ - correction for correction in assignment.corrections.all() - if not correction.corrected - ], - 'missing_images': [g for g in galleys if g.has_missing_image_files()], - 'supplementary_files': supplementary_files, - 'proofing_assignments': assignment.proofing_assignments_for_corrections, - 'galley_form': galley_form, - 'complete_form': complete_form, - } - - return render(request, template, context) - - -@decorators.production_user_or_editor_required -def typesetting_delete_correction(request, correction_id): - try: - correction = models.TypesettingCorrection.objects.get( - task__round__article__journal=request.journal, - pk=correction_id, - ) - except models.TypesettingCorrection.DoesNotExist: - messages.add_message( - request, - messages.WARNING, - 'Correction already adressed', - ) - - else: - correction.delete() - if correction.galley: - messages.add_message( - request, - messages.INFO, - 'Correction Deleted', - ) - else: - messages.add_message( - request, - messages.INFO, - 'Confirmed', - ) - return redirect(request.META.get('HTTP_REFERER')) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_assign_proofreader(request, article_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - rounds = models.TypesettingRound.objects.filter(article=article) - proofreaders = logic.get_proofreaders(article, rounds[0]) - galleys = core_models.Galley.objects.filter( - article=article, - ) - - if not galleys: - messages.add_message( - request, - messages.WARNING, - 'You cannot assign a proofreader without typeset files.', - ) - - return redirect(reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - )) - - form = forms.AssignProofreader( - proofreaders=proofreaders, - round=rounds[0], - user=request.user, - ) - - if request.POST: - form = forms.AssignProofreader( - request.POST, - proofreaders=proofreaders, - round=rounds[0], - user=request.user, - ) - - if form.is_valid() and form.is_confirmed(): - assignment = form.save() - - messages.add_message( - request, - messages.SUCCESS, - 'Proofing Assignment created.' - ) - - return redirect( - reverse( - 'typesetting_notify_proofreader', - kwargs={ - 'article_id': article.pk, - 'assignment_id': assignment.pk, - } - ) - ) - - template = 'typesetting/typesetting_assign_proofreader.html' - context = { - 'article': article, - 'proofreaders': proofreaders, - 'form': form, - 'galleys': galleys, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -@security.require_not_notified(models.GalleyProofing) -def typesetting_notify_proofreader(request, article_id, assignment_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - assignment = get_object_or_404( - models.GalleyProofing, - pk=assignment_id, - completed__isnull=True, - notified=False, - ) - message = logic.get_proofreader_notification( - assignment, - article, - request, - ) - - if request.POST: - message = request.POST.get('message') - skip = True if 'skip' in request.POST else False - assignment.assign( - user=request.user, - skip=skip - ) - notify.galley_proofing_assignment( - request, - assignment, - message, - skip=skip - ) - messages.add_message( - request, - messages.SUCCESS, - 'Assignment created', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - template = 'typesetting/typesetting_notify_proofreader.html' - context = { - 'article': article, - 'assignment': assignment, - 'message': message, - } - - return render(request, template, context) - - -@decorators.has_journal -@decorators.production_user_or_editor_required -def typesetting_manage_proofing_assignment(request, article_id, assignment_id): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - assignment = get_object_or_404( - models.GalleyProofing, - pk=assignment_id, - ) - proofreaders = logic.get_proofreaders( - article, - assignment.round, - assignment=assignment, - ) - - form = forms.EditProofingAssignment( - instance=assignment, - ) - - if request.POST: - - if 'action' in request.POST: - - action = request.POST.get('action') - - if action == 'cancel': - assignment.cancel( - user=request.user - ) - notify.galley_proofing_cancel( - request, - assignment, - ) - messages.add_message( - request, - messages.SUCCESS, - 'Proofing task cancelled.', - ) - elif action == 'reset': - assignment.reset( - user=request.user - ) - notify.galley_proofing_reset( - request, - assignment, - ) - messages.add_message( - request, - messages.SUCCESS, - 'Proofing task reset.', - ) - elif action == 'complete': - assignment.complete( - user=request.user, - ) - notify.galley_proofing_complete( - request, - assignment, - ) - messages.add_message( - request, - messages.SUCCESS, - 'Proofing task completed.', - ) - - return redirect( - reverse( - 'typesetting_article', - kwargs={'article_id': article.pk}, - ) - ) - - form = forms.EditProofingAssignment( - request.POST, - instance=assignment, - ) - - if form.is_valid(): - form.save() - messages.add_message( - request, - messages.SUCCESS, - 'Assignment updated.', - ) - - return redirect( - reverse( - 'typesetting_manage_proofing_assignment', - kwargs={ - 'article_id': article.pk, - 'assignment_id': assignment.pk, - } - ) - ) - - template = 'typesetting/typesetting_manage_proofing_assignment.html' - context = { - 'article': article, - 'assignment': assignment, - 'proofreaders': proofreaders, - 'form': form, - } - - return render(request, template, context) - - -@login_required -def typesetting_proofreading_assignments(request): - assignments = models.GalleyProofing.active_objects.filter( - proofreader=request.user, - round__article__journal=request.journal, - ) - - active_assignments = assignments.filter( - completed__isnull=True, - ) - - completed_assignments = assignments.filter( - completed__isnull=False, - ) - - template = 'typesetting/typesetting_proofing_assignments.html' - context = { - 'active_assignments': active_assignments, - 'completed_assignments': completed_assignments, - } - - return render(request, template, context) - - -@security.proofreader_for_article_required -def typesetting_proofreading_assignment(request, assignment_id): - assignment = get_object_or_404( - models.GalleyProofing.active_objects, - pk=assignment_id, - completed__isnull=True, - cancelled=False, - ) - galleys = core_models.Galley.objects.filter( - article=assignment.round.article, - ) - - form = forms.ProofingForm(instance=assignment) - - if request.POST: - form = forms.ProofingForm(request.POST, instance=assignment) - - if request.FILES: - logic.handle_proofreader_file( - request, - assignment, - assignment.round.article, - ) - - if form.is_valid(): - form.save() - - if form.is_confirmed(): - assignment.complete( - user=request.user - ) - notify.galley_proofing_complete( - request, - assignment - ) - messages.add_message( - request, - messages.SUCCESS, - 'Proofreading Assignment complete.', - ) - return redirect( - reverse( - 'core_dashboard', - ) - ) - - template = 'typesetting/typesetting_proofreading_assignment.html' - context = { - 'assignment': assignment, - 'galleys': galleys, - 'form': form, - } - - return render(request, template, context) - - -@security.can_preview_typesetting_article -def typesetting_preview_galley( - request, - article_id, - galley_id, - assignment_id=None, -): - """ - Displays a preview of a galley object - :param request: HttpRequest object - :param assignment_id: ProofingTask object PK - :param galley_id: Galley object PK - :param article_id: Article object PK - :param assignment_id: Optional proofing or typesetting assignment id - :return: HttpResponse - """ - proofing_task = None - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - galley = get_object_or_404( - core_models.Galley, - pk=galley_id, - article_id=article.pk, - ) - - if assignment_id: - try: - proofing_task = models.GalleyProofing.objects.get( - pk=assignment_id, - round__article=article, - ) - proofing_task.proofed_files.add(galley) - except models.GalleyProofing.DoesNotExist: - get_object_or_404( - models.TypesettingAssignment, - pk=assignment_id, - ) - - if galley.type == 'xml' or galley.type == 'html': - template = 'journal/article.html' - elif galley.type == 'epub': - template = 'proofing/preview/epub.html' - else: - template = 'typesetting/preview_embedded.html' - - article_content = galley.file_content() - galleys = article.galley_set.filter(public=True) - - context = { - 'proofing': True, - 'proofing_task': proofing_task, - 'galley': galley, - 'galleys': galleys, - 'article': article if article else proofing_task.round.article, - 'identifier_type': 'id', - 'identifier': article.pk if article else proofing_task.round.article.pk, - 'article_content': article_content, - 'tables_in_galley': journal_logic.get_all_tables_from_html(article_content), - } - - return render(request, template, context) - - -@security.proofreader_for_article_required -def typesetting_proofing_download(request, article_id, assignment_id, file_id): - """ - Serves a galley for proofreader - """ - assignment = get_object_or_404( - models.GalleyProofing, - pk=assignment_id, - round__article__id=article_id, - ) - file = get_object_or_404(core_models.File, pk=file_id) - try: - galley = core_models.Galley.objects.get( - article_id=assignment.round.article.pk, - file=file, - ) - assignment.proofed_files.add(galley) - return files.serve_file(request, file, assignment.round.article) - except core_models.Galley.DoesNotExist: - messages.add_message( - request, - messages.WARNING, - 'Requested file is not a typeset file for proofing', - ) - return redirect(request.META.get('HTTP_REFERER')) - - -@security.can_preview_typesetting_article -def preview_figure( - request, - galley_id, - file_name, - assignment_id=None, - article_id=None, -): - - if assignment_id: - try: - assignment = models.TypesettingAssignment.objects.get( - pk=assignment_id, - typesetter=request.user, - ) - galley = core_models.Galley.objects.get( - pk=galley_id, - article_id=assignment.round.article.pk, - ) - except (models.TypesettingAssignment.DoesNotExist, core_models.Galley.DoesNotExist): - assignment = get_object_or_404( - models.GalleyProofing, - pk=assignment_id, - proofreader=request.user - ) - galley = get_object_or_404( - core_models.Galley, - pk=galley_id, - article_id=assignment.round.article.pk, - ) - elif article_id and request.user.has_an_editor_role(request): - article = get_object_or_404( - submission_models.Article, - pk=article_id, - journal=request.journal, - ) - galley = get_object_or_404( - core_models.Galley, - pk=galley_id, - article_id=article.pk, - ) - else: - raise PermissionDenied - - return article_figure(request, galley.article.pk, galley.pk, file_name) - - -@security.user_can_manage_file -def article_file_make_galley(request, article_id, file_id): - """ Copies a file to be a publicly available galley - - :param request: the request associated with this call - :param article_id: the ID of the associated articled - :param file_id: the file ID for which to view the history - :return: a redirect to the URL at the GET parameter 'return' - """ - article_object = get_object_or_404( - submission_models.Article, pk=article_id) - janeway_file = get_object_or_404( - core_models.File, pk=file_id) - - blob = janeway_file.get_file(article_object, as_bytes=True) - content_file = ContentFile(blob) - content_file.name = janeway_file.original_filename - production_logic.save_galley( - article_object, request, content_file, - is_galley=True, - ) - - - return redirect(request.GET['return']) - - -@require_POST -@decorators.production_user_or_editor_required -def mint_supp_doi(request, supp_file_id): - supp_file = get_object_or_404( - core_models.SupplementaryFile, - id=supp_file_id, - ) - # Cope with file not having foreign key to article - if supp_file.file.article.journal != request.journal: - raise Http404() - - doi = request.POST.get("doi") - if not doi: - messages.add_message( - request, - messages.ERROR, - 'The DOI field must be filled in', - ) - else: - try: - logic.validate_supp_file_doi(supp_file, doi) - doi = logic.mint_supp_file_doi(supp_file, doi) - except ValidationError as e: - messages.add_message( - request, - messages.ERROR, - 'Invalid DOI: %s' % e.message, - ) - except Exception as e: - messages.add_message( - request, - messages.ERROR, - 'There was a problem minting the DOI,' - ' the site administrator has been alerted', - ) - logger.exception("Error minting supplementary file DOI %s", e) - else: - messages.add_message( - request, - messages.INFO, - 'Minted DOI for supplementary file #%d' % supp_file.pk, - ) - - return redirect(request.META.get('HTTP_REFERER'))