Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/cats_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CREATE TABLE `activity_type` (

/*Data for the table `activity_type` */

insert into `activity_type`(`activity_type_id`,`short_description`) values (100,'Call');
insert into `activity_type`(`activity_type_id`,`short_description`) values (100,'Not reached');
insert into `activity_type`(`activity_type_id`,`short_description`) values (200,'Email');
insert into `activity_type`(`activity_type_id`,`short_description`) values (300,'Meeting');
insert into `activity_type`(`activity_type_id`,`short_description`) values (400,'Other');
Expand Down
6 changes: 3 additions & 3 deletions js/activity.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ function Activity_fillTypeSelect(selectList, selectedText)
{
var optionElements = new Array();

/* Call option. */
/* Not reached option. */
optionElements[0] = document.createElement("option");
optionElements[0].value = ACTIVITY_CALL;
optionElements[0].appendChild(document.createTextNode("Call"));
optionElements[0].appendChild(document.createTextNode("Not reached"));

/* Call (Talked) option. */
optionElements[1] = document.createElement("option");
Expand Down Expand Up @@ -79,7 +79,7 @@ function Activity_fillTypeSelect(selectList, selectedText)
/* Select the correct option. */
if (selectedText)
{
if (selectedText == "Call")
if (selectedText == "Not reached")
{
optionElements[0].setAttribute("selected", "selected");
}
Expand Down
2 changes: 1 addition & 1 deletion modules/candidates/AddActivityChangeStatusModal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<span id="addActivitySpanA">Activity Type</span><br />
<select id="activityTypeID" name="activityTypeID" class="inputbox" style="width: 150px; margin-bottom: 4px;">
<option selected="selected" value="">-- Select --</option>
<option value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
<option value="<?php echo(ACTIVITY_CALL); ?>">Not reached</option>
<option value="<?php echo(ACTIVITY_CALL_TALKED); ?>">Call (Talked)</option>
<option value="<?php echo(ACTIVITY_CALL_LVM); ?>">Call (LVM)</option>
<option value="<?php echo(ACTIVITY_CALL_MISSED); ?>">Call (Missed)</option>
Expand Down
2 changes: 1 addition & 1 deletion modules/contacts/AddActivityScheduleEventModal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<span id="addActivitySpanA">Activity Type</span><br />
<select id="activityTypeID" name="activityTypeID" class="inputbox" style="width: 150px; margin-bottom: 4px;">
<option selected="selected" value="">-- Select --</option>
<option value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
<option value="<?php echo(ACTIVITY_CALL); ?>">Not reached</option>
<option value="<?php echo(ACTIVITY_CALL_TALKED); ?>">Call (Talked)</option>
<option value="<?php echo(ACTIVITY_CALL_LVM); ?>">Call (LVM)</option>
<option value="<?php echo(ACTIVITY_CALL_MISSED); ?>">Call (Missed)</option>
Expand Down
5 changes: 5 additions & 0 deletions modules/install/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -1442,6 +1442,11 @@ public static function get()
$db->query("ALTER TABLE `".$row[\'table_name\']."` ENGINE=InnoDB");
}
',
'376' => '
UPDATE activity_type
SET short_description = \'Not reached\'
WHERE activity_type_id = 100;
',

);
}
Expand Down
2 changes: 1 addition & 1 deletion test/features/activities.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Feature: Activities
And I follow "Log an Activity"
And I wait for the activity note box to appear
And I switch to the iframe "popupInner"
And I select "Call" from "activityTypeID"
And I select "Not reached" from "activityTypeID"
And fill in "activityNote" with "Call Gandalf"
And press "Save"
And press "Close"
Expand Down
Loading