Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
services
t3o sites
voting.typo3.org
extensions
election
Commits
282585d6
Commit
282585d6
authored
Mar 13, 2020
by
Stefan Busemann
Browse files
Merge branch '19-general-things' into 'master'
Resolve "General things" Closes
#19
See merge request t3o/election!8
parents
98594c5d
da608ea3
Changes
47
Hide whitespace changes
Inline
Side-by-side
Classes/Controller/AbstractBeController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Messaging\AbstractMessage;
use
TYPO3\CMS\Extbase\Mvc\Controller\ActionController
;
use
TYPO3\CMS\Extbase\Mvc\View\ViewInterface
;
use
TYPO3\CMS\Extbase\Property\TypeConverter\DateTimeConverter
;
use
T
YPO
3\Election\Domain\Model\Configuration
;
use
T3
o
\Election\Domain\Model\Configuration
;
/**
* Class AbstractBeController
...
...
@@ -37,7 +37,7 @@ abstract class AbstractBeController extends ActionController
protected
$configuration
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ConfigurationRepository
* @var \T3
o
\Election\Domain\Repository\ConfigurationRepository
* @inject
*/
protected
$configurationRepository
=
null
;
...
...
Classes/Controller/AbstractProtectedBeController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
Classes/Controller/BeConfigurationController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,7 +14,7 @@ namespace TYPO3\Election\Controller;
* The TYPO3 project - inspiring people to share!
*/
use
T
YPO
3\Election\Domain\Model\Configuration
;
use
T3
o
\Election\Domain\Model\Configuration
;
/**
* Class BeConfigurationController
...
...
Classes/Controller/BeDashboardController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -15,8 +15,8 @@ namespace TYPO3\Election\Controller;
*/
use
TYPO3\CMS\Core\Messaging\AbstractMessage
;
use
TYPO3\CMS\Extbase\Utility\LocalizationUtility
;
use
T
YPO
3\Election\Domain\Repository\ElectionCircularRepository
;
use
T
YPO
3\Election\Domain\Repository\ElectorImportRepository
;
use
T3
o
\Election\Domain\Repository\ElectionCircularRepository
;
use
T3
o
\Election\Domain\Repository\ElectorImportRepository
;
/**
* Dashboard controller
...
...
@@ -27,7 +27,7 @@ class BeDashboardController extends AbstractBeController
const
ACTION_INDEX
=
'index'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionRepository
* @var \T3
o
\Election\Domain\Repository\ElectionRepository
* @inject
*/
protected
$electionRepository
=
null
;
...
...
Classes/Controller/BeElectionCircularController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -17,11 +17,11 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use
TYPO3\CMS\Core\Database\ConnectionPool
;
use
TYPO3\CMS\Core\Database\DatabaseConnection
;
use
TYPO3\CMS\Core\Utility\GeneralUtility
;
use
T
YPO
3\Election\Domain\Model\ElectionCircular
;
use
T
YPO
3\Election\Domain\Model\Elector
;
use
T
YPO
3\Election\Service\CircularService
;
use
T
YPO
3\Election\Service\ElectionInvitationService
;
use
T
YPO
3\Election\Utility\MailUtility
;
use
T3
o
\Election\Domain\Model\ElectionCircular
;
use
T3
o
\Election\Domain\Model\Elector
;
use
T3
o
\Election\Service\CircularService
;
use
T3
o
\Election\Service\ElectionInvitationService
;
use
T3
o
\Election\Utility\MailUtility
;
/**
* Class BeConfigurationController
...
...
@@ -41,13 +41,13 @@ class BeElectionCircularController extends AbstractProtectedBeController
const
ACTION_SEND_PREVIEW
=
'sendPreview'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionCircularRepository
* @var \T3
o
\Election\Domain\Repository\ElectionCircularRepository
* @inject
*/
protected
$electionCircularRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionRepository
* @var \T3
o
\Election\Domain\Repository\ElectionRepository
* @inject
*/
protected
$electionRepository
=
null
;
...
...
Classes/Controller/BeElectionController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,7 +14,7 @@ namespace TYPO3\Election\Controller;
* The TYPO3 project - inspiring people to share!
*/
use
T
YPO
3\Election\Domain\Model\Election
;
use
T3
o
\Election\Domain\Model\Election
;
/**
* Class BeConfigurationController
...
...
@@ -31,19 +31,19 @@ class BeElectionController extends AbstractProtectedBeController
const
ACTION_SUMMARY
=
'summary'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionRepository
* @var \T3
o
\Election\Domain\Repository\ElectionRepository
* @inject
*/
protected
$electionRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorateRepository
* @var \T3
o
\Election\Domain\Repository\ElectorateRepository
* @inject
*/
protected
$electorateRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\NomineeRepository
* @var \T3
o
\Election\Domain\Repository\NomineeRepository
* @inject
*/
protected
$nomineeRepository
=
null
;
...
...
Classes/Controller/BeElectorController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,12 +14,12 @@ namespace TYPO3\Election\Controller;
* The TYPO3 project - inspiring people to share!
*/
use
TYPO3\CMS\Extbase\Persistence\ObjectStorage
;
use
T
YPO
3\Election\Domain\Model\Dto\ElectorImport
as
ElectorImportDto
;
use
T
YPO
3\Election\Domain\Model\Election
;
use
T
YPO
3\Election\Domain\Model\Elector
;
use
T
YPO
3\Election\Domain\Model\ElectorImport
;
use
T
YPO
3\Election\Utility\CsvUtility
;
use
T
YPO
3\Election\Utility\FileUtility
;
use
T3
o
\Election\Domain\Model\Dto\ElectorImport
as
ElectorImportDto
;
use
T3
o
\Election\Domain\Model\Election
;
use
T3
o
\Election\Domain\Model\Elector
;
use
T3
o
\Election\Domain\Model\ElectorImport
;
use
T3
o
\Election\Utility\CsvUtility
;
use
T3
o
\Election\Utility\FileUtility
;
/**
* Class BeConfigurationController
...
...
@@ -40,19 +40,19 @@ class BeElectorController extends AbstractProtectedBeController
const
ACTION_OVERWRITE_ALL
=
'overwriteAll'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorateRepository
* @var \T3
o
\Election\Domain\Repository\ElectorateRepository
* @inject
*/
protected
$electorateRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorRepository
* @var \T3
o
\Election\Domain\Repository\ElectorRepository
* @inject
*/
protected
$electorRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorImportRepository
* @var \T3
o
\Election\Domain\Repository\ElectorImportRepository
* @inject
*/
protected
$electorImportRepository
=
null
;
...
...
Classes/Controller/BeElectorateController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,7 +14,7 @@ namespace TYPO3\Election\Controller;
* The TYPO3 project - inspiring people to share!
*/
use
T
YPO
3\Election\Domain\Model\Electorate
;
use
T3
o
\Election\Domain\Model\Electorate
;
/**
* Class BeElectorateController
...
...
@@ -31,13 +31,13 @@ class BeElectorateController extends AbstractProtectedBeController
const
ACTION_UPDATE_AND_IMPORT_ELECTORS
=
'updateAndImportElectors'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorateRepository
* @var \T3
o
\Election\Domain\Repository\ElectorateRepository
* @inject
*/
protected
$electorateRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectorRepository
* @var \T3
o
\Election\Domain\Repository\ElectorRepository
* @inject
*/
protected
$electorRepository
=
null
;
...
...
Classes/Controller/BeNomineeController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,8 +14,8 @@ namespace TYPO3\Election\Controller;
* The TYPO3 project - inspiring people to share!
*/
use
T
YPO
3\Election\Domain\Model\Nominee
;
use
T
YPO
3\Election\Property\TypeConverter\UploadedFileReferenceConverter
;
use
T3
o
\Election\Domain\Model\Nominee
;
use
T3
o
\Election\Property\TypeConverter\UploadedFileReferenceConverter
;
/**
* Class BeConfigurationController
...
...
@@ -32,7 +32,7 @@ class BeNomineeController extends AbstractProtectedBeController
const
ACTION_SHOW
=
'show'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\NomineeRepository
* @var \T3
o
\Election\Domain\Repository\NomineeRepository
* @inject
*/
protected
$nomineeRepository
=
null
;
...
...
Classes/Controller/FeDashboardController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -25,7 +25,7 @@ class FeDashboardController extends ActionController
const
ACTION_INDEX
=
'index'
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionRepository
* @var \T3
o
\Election\Domain\Repository\ElectionRepository
* @inject
*/
protected
$electionRepository
=
null
;
...
...
Classes/Controller/FeElectionController.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Controller
;
namespace
T3
o
\Election\Controller
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -18,10 +18,10 @@ namespace TYPO3\Election\Controller;
use
TYPO3\CMS\Core\Messaging\AbstractMessage
;
use
TYPO3\CMS\Extbase\Mvc\Controller\ActionController
;
use
TYPO3\CMS\Extbase\Utility\LocalizationUtility
;
use
T
YPO
3\Election\Domain\Model\Dto\ElectionVoting
;
use
T
YPO
3\Election\Domain\Model\ElectionInvitation
;
use
T
YPO
3\Election\Domain\Model\ElectionVote
;
use
T
YPO
3\Election\Domain\Model\Election
;
use
T3
o
\Election\Domain\Model\Dto\ElectionVoting
;
use
T3
o
\Election\Domain\Model\ElectionInvitation
;
use
T3
o
\Election\Domain\Model\ElectionVote
;
use
T3
o
\Election\Domain\Model\Election
;
/**
* Class FeElectionController
...
...
@@ -40,13 +40,13 @@ class FeElectionController extends ActionController
protected
$hashService
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionVoteRepository
* @var \T3
o
\Election\Domain\Repository\ElectionVoteRepository
* @inject
*/
protected
$electionVoteRepository
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Repository\ElectionInvitationRepository
* @var \T3
o
\Election\Domain\Repository\ElectionInvitationRepository
* @inject
*/
protected
$electionInvitationRepository
=
null
;
...
...
@@ -130,7 +130,7 @@ class FeElectionController extends ActionController
/**
* @param ElectionVoting $electionVoting
* @validate $electionVoting \T
YPO
3\Election\Domain\Validator\ElectionVotingValidator
* @validate $electionVoting \T3
o
\Election\Domain\Validator\ElectionVotingValidator
*/
public
function
submitVoteAction
(
ElectionVoting
$electionVoting
)
{
...
...
Classes/Domain/Model/AbstractEntity.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
Classes/Domain/Model/AbstractPerson.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
Classes/Domain/Model/Cato/ImportProcessing.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model\Cato
;
namespace
T3
o
\Election\Domain\Model\Cato
;
/**
* Unused by now, will be used for actions done per imported elector
...
...
Classes/Domain/Model/Configuration.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
Classes/Domain/Model/Dto/ElectionVoting.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model\Dto
;
namespace
T3
o
\Election\Domain\Model\Dto
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -14,7 +14,7 @@ namespace TYPO3\Election\Domain\Model\Dto;
* The TYPO3 project - inspiring people to share!
*/
use
T
YPO
3\Election\Domain\Model\AbstractEntity
;
use
T3
o
\Election\Domain\Model\AbstractEntity
;
/**
* Class ElectionVoting
...
...
@@ -22,12 +22,12 @@ use TYPO3\Election\Domain\Model\AbstractEntity;
class
ElectionVoting
extends
AbstractEntity
{
/**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T
YPO
3\Election\Domain\Model\Nominee>
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3
o
\Election\Domain\Model\Nominee>
*/
protected
$nominees
;
/**
* @var \T
YPO
3\Election\Domain\Model\ElectionInvitation
* @var \T3
o
\Election\Domain\Model\ElectionInvitation
*/
protected
$electionInvitation
;
...
...
@@ -48,7 +48,7 @@ class ElectionVoting extends AbstractEntity
}
/**
* @return \T
YPO
3\Election\Domain\Model\ElectionInvitation
* @return \T3
o
\Election\Domain\Model\ElectionInvitation
*/
public
function
getElectionInvitation
()
{
...
...
@@ -56,7 +56,7 @@ class ElectionVoting extends AbstractEntity
}
/**
* @param \T
YPO
3\Election\Domain\Model\ElectionInvitation $electionInvitation
* @param \T3
o
\Election\Domain\Model\ElectionInvitation $electionInvitation
*/
public
function
setElectionInvitation
(
$electionInvitation
)
{
...
...
Classes/Domain/Model/Dto/ElectorImport.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model\Dto
;
namespace
T3
o
\Election\Domain\Model\Dto
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -20,12 +20,12 @@ namespace TYPO3\Election\Domain\Model\Dto;
class
ElectorImport
{
/**
* @var \T
YPO
3\Election\Domain\Model\Electorate
* @var \T3
o
\Election\Domain\Model\Electorate
*/
protected
$chosenElectorate
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Model\Electorate[]
* @var \T3
o
\Election\Domain\Model\Electorate[]
*/
protected
$availableElectorates
=
[];
...
...
@@ -37,11 +37,11 @@ class ElectorImport
/**
* ElectorImport constructor.
*
* @param \T
YPO
3\Election\Domain\Model\Electorate|null $chosenElectorate
* @param \T
YPO
3\Election\Domain\Model\Electorate[] $availableElectorates
* @param \T3
o
\Election\Domain\Model\Electorate|null $chosenElectorate
* @param \T3
o
\Election\Domain\Model\Electorate[] $availableElectorates
*/
public
function
__construct
(
\
T
YPO
3\Election\Domain\Model\Electorate
$chosenElectorate
=
null
,
\
T3
o
\Election\Domain\Model\Electorate
$chosenElectorate
=
null
,
$availableElectorates
=
null
)
{
$this
->
chosenElectorate
=
$chosenElectorate
;
...
...
@@ -49,7 +49,7 @@ class ElectorImport
}
/**
* @return \T
YPO
3\Election\Domain\Model\Electorate
* @return \T3
o
\Election\Domain\Model\Electorate
*/
public
function
getChosenElectorate
()
{
...
...
@@ -57,7 +57,7 @@ class ElectorImport
}
/**
* @param \T
YPO
3\Election\Domain\Model\Electorate $chosenElectorate
* @param \T3
o
\Election\Domain\Model\Electorate $chosenElectorate
*/
public
function
setChosenElectorate
(
$chosenElectorate
)
{
...
...
@@ -65,7 +65,7 @@ class ElectorImport
}
/**
* @return \T
YPO
3\Election\Domain\Model\Electorate[]
* @return \T3
o
\Election\Domain\Model\Electorate[]
*/
public
function
getAvailableElectorates
()
{
...
...
@@ -73,7 +73,7 @@ class ElectorImport
}
/**
* @param \T
YPO
3\Election\Domain\Model\Electorate[] $availableElectorates
* @param \T3
o
\Election\Domain\Model\Electorate[] $availableElectorates
*/
public
function
setAvailableElectorates
(
$availableElectorates
)
{
...
...
Classes/Domain/Model/Election.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -41,12 +41,12 @@ class Election extends AbstractEntity
protected
$endDate
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Model\Electorate
* @var \T3
o
\Election\Domain\Model\Electorate
*/
protected
$electorate
=
null
;
/**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T
YPO
3\Election\Domain\Model\Nominee>
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3
o
\Election\Domain\Model\Nominee>
*/
protected
$nominees
=
null
;
...
...
@@ -56,7 +56,7 @@ class Election extends AbstractEntity
protected
$numberOfVotes
=
0
;
/**
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T
YPO
3\Election\Domain\Model\ElectionVote>
* @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\T3
o
\Election\Domain\Model\ElectionVote>
*/
protected
$electionVotes
=
null
;
...
...
@@ -125,7 +125,7 @@ class Election extends AbstractEntity
}
/**
* @return \T
YPO
3\Election\Domain\Model\Electorate
* @return \T3
o
\Election\Domain\Model\Electorate
*/
public
function
getElectorate
()
{
...
...
Classes/Domain/Model/ElectionCircular.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -20,8 +20,8 @@ use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use
TYPO3\CMS\Extbase\Object\ObjectManager
;
use
TYPO3\CMS\Extbase\Security\Cryptography\HashService
;
use
TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
;
use
T
YPO
3\Election\Controller\FeElectionController
;
use
T
YPO
3\Election\Domain\Repository\ConfigurationRepository
;
use
T3
o
\Election\Controller\FeElectionController
;
use
T3
o
\Election\Domain\Repository\ConfigurationRepository
;
/**
* Class ElectionCircular
...
...
@@ -39,7 +39,7 @@ class ElectionCircular extends AbstractEntity
protected
$body
=
''
;
/**
* @var \T
YPO
3\Election\Domain\Model\Election
* @var \T3
o
\Election\Domain\Model\Election
*/
protected
$election
=
null
;
...
...
Classes/Domain/Model/ElectionInvitation.php
View file @
282585d6
<?php
namespace
T
YPO
3\Election\Domain\Model
;
namespace
T3
o
\Election\Domain\Model
;
/*
* This file is part of the TYPO3 CMS project.
...
...
@@ -25,12 +25,12 @@ class ElectionInvitation extends AbstractEntity
protected
$secret
=
''
;
/**
* @var \T
YPO
3\Election\Domain\Model\ElectionCircular
* @var \T3
o
\Election\Domain\Model\ElectionCircular
*/
protected
$electionCircular
=
null
;
/**
* @var \T
YPO
3\Election\Domain\Model\Elector
* @var \T3
o
\Election\Domain\Model\Elector
*/
protected
$elector
=
null
;
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment