Merge develop back to Master for a new release. #493

RussH · 2020-09-11T16:48:27Z

This will be the basis for a PHP 7.2 compatible release from Master.

…level checks for duplicate functions

conflicts resolved using master part, so not working code now # Conflicts: # js/lib.js # js/quickAction.js # lib/TemplateUtility.php

# Conflicts: # modules/candidates/CandidatesUI.php

RussH · 2020-10-15T09:03:20Z

Here is an overview of what got changed by this pull request:

Issues
======
- Added 32
           

Complexity increasing per file
==============================
- js/ckeditor-manager.js  2
- lib/JobOrderStatuses.php  4
- modules/candidates/CandidatesUI.php  10
- lib/ImportableEntity.php  2
- modules/settings/SettingsUI.php  2
- lib/ZipLookup.php  3
- modules/candidates/quickAction-duplicates.js  2
- modules/import/ImportUI.php  6
- lib/ImportUtility.php  9
- lib/Candidates.php  26
- lib/CompaniesImport.php  2
- src/OpenCATS/UI/CandidateDuplicateQuickActionMenu.php  1
- src/OpenCATS/UI/QuickActionMenu.php  1
- lib/ContactsImport.php  2
- lib/CandidatesImport.php  2
         

Complexity decreasing per file
==============================
+ lib/JobOrders.php  -3
         

Clones added
============
- js/emailHandler.js  2

See the complete overview on Codacy

RussH · 2020-10-15T09:03:44Z

js/ckeditor-manager.js

+function placeCkEditorIn(nodeId)
+{
+    CKEDITOR.replace(nodeId, { extraPlugins: 'font' } );
+    CKEDITOR.on('instanceReady', function(ev)


Codacy found an issue: Strings must use doublequote. (quotes)

RussH · 2020-10-15T09:03:45Z

src/OpenCATS/Entity/JobOrder.php

@@ -280,7 +288,7 @@ static function create(
            $siteId,
            $title,
            $type,
-            $status = 0,
+            $status = \JobOrderStatuses::getDefaultStatus(),


Codacy found an issue: Avoid unused local variables such as '$status'.

RussH · 2020-10-15T09:03:46Z

lib/JobOrderStatuses.php

+        'Closed / Canceled',
+        'Upcoming / Lead'
+    );
+    private static $_defaultSharingStatuses = array('Active');


Codacy found an issue: Avoid excessively long variable names like $_defaultSharingStatuses. Keep variable name length under 20.

RussH · 2020-10-15T09:03:47Z

lib/Candidates.php

+        $rsTmp = $this->_db->getAllAssoc($sql);
+
+        if($rsTmp || count($rsTmp) > 0){
+            foreach($rsTmp AS $index => $newID){


Codacy found an issue: Avoid unused local variables such as '$index'.

RussH · 2020-10-15T09:03:48Z

lib/Candidates.php

+        }
+    }
+
+    private function mergePipelines($oldCandidateID, $newCandidateID){


Codacy found an issue: The method mergePipelines() has 172 lines of code. Current threshold is set to 100. Avoid really long methods.

RussH · 2020-10-15T09:03:49Z

lib/JobOrderStatuses.php

+        'Upcoming / Lead'
+    );
+    private static $_defaultSharingStatuses = array('Active');
+    private static $_defaultStatisticsStatuses = array('Active', 'OnHold', 'Full', 'Closed');


Codacy found an issue: Avoid excessively long variable names like $_defaultStatisticsStatuses. Keep variable name length under 20.

RussH · 2020-10-15T09:03:50Z

lib/Search.php

-            {
-                $activeCriterion = "AND (joborder.status IN ('Active', 'OnHold', 'Full'))";
-            }
+            $activeCriterion = "AND (joborder.status IN ".JobOrderStatuses::getOpenStatusSQL().")";


Codacy found an issue: Avoid using static access to class 'JobOrderStatuses' in method 'byTitle'.

RussH · 2020-10-15T09:03:52Z

modules/home/dataGrids.php

@@ -187,6 +181,7 @@ public function getSQL($selectSQL, $joinSQL, $whereSQL, $havingSQL, $orderSQL, $
            PIPELINE_STATUS_SUBMITTED,
            PIPELINE_STATUS_INTERVIEWING,
            PIPELINE_STATUS_OFFERED,
+            JobOrderStatuses::getOpenStatusSQL(),


Codacy found an issue: Avoid using static access to class 'JobOrderStatuses' in method 'getSQL'.

RussH · 2020-10-15T09:03:53Z

lib/Candidates.php

+
+
+
+    public function mergeDuplicates($params, $rs)


Codacy found an issue: The method mergeDuplicates() has 278 lines of code. Current threshold is set to 100. Avoid really long methods.

RussH · 2020-10-15T09:03:54Z

js/ckeditor-manager.js

@@ -0,0 +1,21 @@
+
+function placeCkEditorIn(nodeId)


Codacy found an issue: 'placeCkEditorIn' is defined but never used. (no-unused-vars)

RussH · 2020-10-15T09:03:55Z

js/lists.js

@@ -44,7 +44,7 @@ function saveListRow(rowNumber, sessionCookie)
    var http = AJAX_getXMLHttpObject();

    /* Build HTTP POST data. */
-    var POSTData = '&savedListID='+rowNumber+'&savedListName='+document.getElementById('savedListRowInput'+rowNumber).value;
+    var POSTData = '&savedListID='+rowNumber+'&savedListName='+encodeURIComponent(document.getElementById('savedListRowInput'+rowNumber).value);


Codacy found an issue: Strings must use doublequote. (quotes)

RussH · 2020-10-15T09:03:56Z

lib/Candidates.php

+                $listIDs .= $row['listID'];
+                $listIDs .= ", ";
+            }
+            $listIDs = substr($listIDs, 0, strlen($lists) - 2);


Codacy found an issue: Avoid unused local variables such as '$lists'.

RussH · 2020-10-15T09:03:57Z

js/emailHandler.js

+    }
+    else
+    {
+        getReplaceText_AJAX(candidateId, templateText, sessionCookie);


Codacy found an issue: 'getReplaceText_AJAX' was used before it was defined. (no-use-before-define)

RussH · 2020-10-15T09:03:58Z

js/ckeditor-manager.js

+
+function placeCkEditorIn(nodeId)
+{
+    CKEDITOR.replace(nodeId, { extraPlugins: 'font' } );


Codacy found an issue: Strings must use doublequote. (quotes)

RussH · 2020-10-15T09:03:59Z

modules/joborders/JobOrdersUI.php

@@ -314,6 +315,8 @@ public function handleRequest()
     */
    private function listByView($errMessage = '')
    {
+        $jobOrderFilters = JobOrderStatuses::getFilters();


Codacy found an issue: Avoid using static access to class 'JobOrderStatuses' in method 'listByView'.

RussH · 2020-10-15T09:04:01Z

scripts/makeBackup.php

-    $queryResult = mysql_query($sql);
-    $totalAttachments = mysql_num_rows($queryResult);
+    $queryResult = mysqli_query($db, $sql);
+    $totalAttachments = mysqli_num_rows($queryResult);


Codacy found an issue: Avoid unused local variables such as '$totalAttachments'.

RussH · 2020-10-15T09:04:02Z

js/ckeditor-manager.js

+    {
+        var tags = ['p', 'ol', 'ul', 'li']; // etc.
+
+        for (var key in tags) {


Codacy found an issue: The body of a for-in should be wrapped in an if statement to filter unwanted properties from the prototype. (guard-for-in)

RussH · 2020-10-15T09:04:03Z

lib/ImportableEntity.php

+    public function __construct($siteID)
+    {
+        $this->_siteID = $siteID;
+        $this->_db = DatabaseConnection::getInstance();


Codacy found an issue: Avoid using static access to class 'DatabaseConnection' in method '__construct'.

RussH · 2020-10-15T09:04:04Z

modules/candidates/quickAction-candidates.js

@@ -10,7 +10,7 @@ quickAction.CandidateMenu.prototype.getOptions = function()
    var options = quickAction.DefaultMenu.prototype.getOptions.call(this);
    if(this.getPermissions().pipelines_addToPipeline)
    {
-        options.push(new quickAction.MenuOption('Add To Pipeline', 'showQuickActionAddToPipeline(' + this.getType() + ');'));
+        options.push(new quickAction.MenuOption('Add To Job Order', 'showQuickActionAddToPipeline(' + this.getType() + ');'));


Codacy found an issue: Strings must use doublequote. (quotes)

RussH · 2020-10-15T09:04:05Z

lib/Candidates.php

@@ -1093,6 +1132,794 @@ public function administrativeHideShow($candidateID, $state)

        return (boolean) $this->_db->query($sql);
    }
+
+    public function checkDuplicity($firstName, $middleName, $lastName, $email1, $email2, $phoneHome, $phoneCell, $phoneWork, $address, $city)


Codacy found an issue: The method checkDuplicity() has an NPath complexity of 1098. The configured NPath complexity threshold is 200.

RussH · 2020-10-15T09:04:06Z

modules/candidates/CandidatesUI.php


        $this->_template->display('./modules/candidates/Show.tpl');
+
+        if (!eval(Hooks::get('CANDIDATE_SHOW'))) return;


Codacy found an issue: Avoid using static access to class 'Hooks' in method 'show'.

RussH · 2020-10-15T09:04:08Z

lib/Search.php

+     * @param string wildcard match string
+     * @return array candidates data
+     */
+    public function all($wildCardString, $sortBy, $sortDirection)


Codacy found an issue: Avoid unused parameters such as '$wildCardString'.

RussH · 2020-10-15T09:04:09Z

lib/Candidates.php

@@ -1093,6 +1132,794 @@ public function administrativeHideShow($candidateID, $state)

        return (boolean) $this->_db->query($sql);
    }
+
+    public function checkDuplicity($firstName, $middleName, $lastName, $email1, $email2, $phoneHome, $phoneCell, $phoneWork, $address, $city)


Codacy found an issue: The method checkDuplicity has 10 parameters. Consider reducing the number of parameters to less than 10.

RussH · 2020-10-15T09:04:10Z

lib/JobOrders.php

-            case JOBORDERS_STATUS_CLOSED:
-                $statusCriterion = "AND joborder.status = 'Closed'";
+            case JOBORDERS_STATUS_SHARE:
+                $statusCriterion = "AND joborder.status IN ".JobOrderStatuses::getShareStatusSQL();


Codacy found an issue: Avoid using static access to class 'JobOrderStatuses' in method 'getAll'.

RussH · 2020-10-15T09:04:11Z

lib/Candidates.php

+
+
+
+    public function mergeDuplicates($params, $rs)


Codacy found an issue: The method mergeDuplicates() has a Cyclomatic Complexity of 34. The configured cyclomatic complexity threshold is 10.

shantadam

The showTemplate() function need to be repositioned prior to getTemplateTextAJAX() to fix this issue in js/emailHandler.js

Kixy25 and others added 30 commits November 29, 2016 19:05

toggle quickactionmenu visibility by clicking it

34b20ca

Candidate duplicates module added and integrated with other modules

c7ae52c

corrected header of file to follow license

6b37f0a

Merge branch 'master' into candidate_duplicates

3d1e11c

Merge branch 'master' into candidate_duplicates

6678c5e

duplicates module integrated into candidates module and added access …

0f33c1b

…level checks for duplicate functions

Merge branch 'master' into candidate_duplicates

a8562d3

Merge branch 'master' into candidate_duplicates

5fa6458

Merge branch 'master' into candidate_duplicates

ffce535

conflicts resolved using master part, so not working code now # Conflicts: # js/lib.js # js/quickAction.js # lib/TemplateUtility.php

added duplicates quick action menu

cc38c5d

quickaction for duplicates added

035cbbd

rename of DuplicateCandidate to CandidateDuplicate

4dff27a

tag fix

b1a14d7

quickaction fixes

519d90b

Merge branch 'master' into candidate_duplicates

b0306f7

Merge branch 'master' into candidate_duplicates

6410f56

# Conflicts: # modules/candidates/CandidatesUI.php

acl related refactoring ifor duplicates

5c7d3e3

fixed typo error

1e8e571

fixed typo error

faf3f1a

Merge branch 'master' into candidate_duplicates

1fa02de

Merge branch 'master' into candidate_duplicates

c9b3cba

Merge branch 'master' into candidate_duplicates

60d7ebc

fixed duplicate quick action menu - added permissions and access level

8a2bbc3

fixed duplicate quick action menu - added permissions and access level

9ab60c2

Merge branch 'master' into candidate_duplicates

bdcd8db

Merge branch 'quickactionmenu_fix' into candidate_duplicates

5679196

removing duplicate info from function parameters

5531084

adjusting candidate datagrid

03ab64e

removing unnecessary duplicate code

ddebc29

adding includes

631d5e0

removed ckeditor/ckeditor_php4.php

8838f08

RussH self-assigned this Oct 15, 2020

RussH commented Oct 15, 2020

View reviewed changes

RussH merged commit a85053e into master Oct 15, 2020

shantadam reviewed Jan 18, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop back to Master for a new release. #493

Merge develop back to Master for a new release. #493

RussH commented Sep 11, 2020

RussH commented Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

RussH Oct 15, 2020

shantadam left a comment


		$this->_template->display('./modules/candidates/Show.tpl');

		if (!eval(Hooks::get('CANDIDATE_SHOW'))) return;

Merge develop back to Master for a new release. #493

Merge develop back to Master for a new release. #493

Conversation

RussH commented Sep 11, 2020

RussH commented Oct 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shantadam left a comment

Choose a reason for hiding this comment