diff --git a/portal/index.php b/portal/index.php
index b2fb28fab..1a01ae825 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -1,5 +1,5 @@
AddMenuButton('showongoing', 'Portal:ShowOngoing', '../portal/index.php?operation=show_ongoing');
$oP->AddMenuButton('newrequest', 'Portal:CreateNewRequest', '../portal/index.php?operation=create_request');
$oP->AddMenuButton('showclosed', 'Portal:ShowClosed', '../portal/index.php?operation=show_closed');
- $oP->AddMenuButton('showtoapprove', 'Portal:ShowToApprove', '../portal/index.php?operation=show_toapprove');
-
- if (isKeyUser()) {
- $oP->AddMenuButton('showtoresolve', 'Portal:ShowToResolve', '../portal/index.php?operation=show_toresolve');
- }
-/* THEBEN
- if (UserRights::CanChangePassword())
+ if (UserRights::CanChangePassword())
{
$oP->AddMenuButton('change_pwd', 'Portal:ChangeMyPassword', '../portal/index.php?loginop=change_pwd');
- } */
-
+ }
}
/**
@@ -190,48 +184,6 @@ function ShowOngoingTickets(WebPage $oP)
$oP->add("".Dict::S('Portal:ResolvedRequests')." \n");
ListResolvedRequests($oP);
$oP->add("\n");
-
- $oP->add("\n");
- $oP->add("
".Dict::S('Portal:RequestsToApprove')." \n");
- ListRequestsToApprove($oP);
- $oP->add("\n");
-
- if (isKeyUser()) {
- $oP->add("\n");
- $oP->add("
".Dict::S('Portal:RequestsToResolve')." \n");
- ListRequestsToResolve($oP);
- $oP->add("\n");
- }
-}
-
-/**
- * Displays the tickets which need approval by mysel
- * @param WebPage $oP The current web page
- * @return void
- */
-// =========================== THEBEN ==================================
-function ShowTicketsToApprove(WebPage $oP)
-{
- $oP->add("\n");
- $oP->add("
".Dict::S('Portal:RequestsToApprove')." \n");
- ListRequestsToApprove($oP);
- $oP->add("\n");
-
-}
-
-/**
- * Displays the tickets which need approval by mysel
- * @param WebPage $oP The current web page
- * @return void
- */
-// =========================== THEBEN ==================================
-function ShowTicketsToResolve(WebPage $oP)
-{
- $oP->add("\n");
- $oP->add("
".Dict::S('Portal:RequestsToResolve')." \n");
- ListRequestsToResolve($oP);
- $oP->add("\n");
-
}
/**
@@ -247,6 +199,134 @@ function ShowClosedTickets(WebPage $oP)
$oP->add("\n");
}
+/**
+ * Displays the form to select a Service Category Id (among the valid ones for the specified user Organization)
+ * @param WebPage $oP Web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @return void
+ */
+function SelectServiceCategory($oP, $oUserOrg)
+{
+ $aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+
+ $oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICECATEGORY_QUERY);
+ $oSearch->AllowAllData(); // In case the user has the rights on his org only
+ $oSet = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
+ if ($oSet->Count() == 1)
+ {
+ $oService = $oSet->Fetch();
+ $iSvcCategory = $oService->GetKey();
+ // Only one Category, skip this step in the wizard
+ SelectServiceSubCategory($oP, $oUserOrg, $iSvcCategory);
+ }
+ else
+ {
+ $oP->add("\n");
+ }
+}
+
+/**
+ * Displays the form to select a Service Subcategory Id (among the valid ones for the specified user Organization)
+ * and based on the page's parameter 'service_id'
+ * @param WebPage $oP Web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @param $iSvcId Id of the selected service in case of pass-through (when there is only one service)
+ * @return void
+ */
+function SelectServiceSubCategory($oP, $oUserOrg, $iSvcId = null)
+{
+ $aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+ if ($iSvcId == null)
+ {
+ $iSvcId = $aParameters['service_id'];
+ }
+ else
+ {
+ $aParameters['service_id'] = $iSvcId;
+ }
+ $iDefaultSubSvcId = isset($aParameters['servicesubcategory_id']) ? $aParameters['servicesubcategory_id'] : 0;
+
+ $iDefaultWizNext = 2;
+
+ $oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICE_SUBCATEGORY_QUERY);
+ RestrictSubcategories($oSearch);
+ $oSearch->AllowAllData(); // In case the user has the rights on his org only
+ $oSet = new CMDBObjectSet($oSearch, array(), array('svc_id' => $iSvcId, 'org_id' => $oUserOrg->GetKey()));
+ if ($oSet->Count() == 1)
+ {
+ // Only one sub service, skip this step of the wizard
+ $oSubService = $oSet->Fetch();
+ $iSubSvdId = $oSubService->GetKey();
+ SelectRequestTemplate($oP, $oUserOrg, $iSvcId, $iSubSvdId);
+ }
+ else
+ {
+ $oServiceCategory = MetaModel::GetObject('Service', $iSvcId, false, true /* allow all data*/);
+ if (is_object($oServiceCategory))
+ {
+ $oP->add("\n");
+ }
+ else
+ {
+ $oP->p("Error: Invalid Service: id = $iSvcId");
+ }
+ }
+}
+
/**
* Displays the form to select a Template
* @param WebPage $oP Web page for the form output
@@ -357,9 +437,21 @@ function SelectRequestTemplate($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null
* @param integer $iTemplateId The identifier of the template (fall through when there is only one template)
* @return void
*/
-function RequestCreationForm($oP, $oUserOrg)
+function RequestCreationForm($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null, $iTemplateId = null)
{
$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+ if (!is_null($iSvcId))
+ {
+ $aParameters['service_id'] = $iSvcId;
+ }
+ if (!is_null($iSubSvcId))
+ {
+ $aParameters['servicesubcategory_id'] = $iSubSvcId;
+ }
+ if (!is_null($iTemplateId))
+ {
+ $aParameters['template_id'] = $iTemplateId;
+ }
$sDescription = '';
if (isset($aParameters['template_id']) && ($aParameters['template_id'] != 0))
@@ -383,33 +475,25 @@ function RequestCreationForm($oP, $oUserOrg)
}
}
- //$oServiceCategory = MetaModel::GetObject('Service', $aParameters['service_id'], false, true /* allow all data*/);
- //$oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false, true /* allow all data*/);
- //if (is_object($oServiceCategory) && is_object($oServiceSubCategory))
+ $oServiceCategory = MetaModel::GetObject('Service', $aParameters['service_id'], false, true /* allow all data*/);
+ $oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false, true /* allow all data*/);
+ if (is_object($oServiceCategory) && is_object($oServiceSubCategory))
{
- $sClass = "UserRequest"; // ComputeClass($oServiceSubCategory->GetKey());
+ $sClass = ComputeClass($oServiceSubCategory->GetKey());
$oRequest = MetaModel::NewObject($sClass);
$oRequest->Set('org_id', $oUserOrg->GetKey());
- $oRequest->Set('caller_id', UserRights::GetContactId());
-// $oRequest->Set('service_id', $aParameters['service_id']);
-// $oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
+ $oRequest->Set('caller_id', UserRights::GetContactId());
+ $oRequest->Set('service_id', $aParameters['service_id']);
+ $oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
-/* $oAttDef = MetaModel::GetAttributeDef($sClass, 'service_id');
+ $oAttDef = MetaModel::GetAttributeDef($sClass, 'service_id');
$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceCategory->GetName());
$oAttDef = MetaModel::GetAttributeDef($sClass, 'servicesubcategory_id');
$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceSubCategory->GetName());
-*/
$aList = explode(',', GetConstant($sClass, 'FORM_ATTRIBUTES'));
-
- IssueLog::info("aList, FORM_ATTRIBUTES=".print_r($aList,true));
- // TODO
- /* echo "";
- echo "Kid Wonder ";
- echo "Oriel ";
- echo " "; */
-
+
$iFlags = 0;
foreach($aList as $sAttCode)
{
@@ -423,10 +507,8 @@ function RequestCreationForm($oP, $oUserOrg)
$aFieldsMap = array();
foreach($aList as $sAttCode)
{
- IssueLog::Info("sAttCode=".$sAttCode);
$value = '';
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
- IssueLog::Info("oAttDef=".print_r($oAttDef,true));
$iFlags = $oRequest->GetAttributeFlags($sAttCode);
if (isset($aParameters[$sAttCode]))
{
@@ -435,10 +517,8 @@ function RequestCreationForm($oP, $oUserOrg)
$aArgs = array('this' => $oRequest);
$sInputId = 'attr_'.$sAttCode;
- IssueLog::Info("sInputId=".$sInputId);
$aFieldsMap[$sAttCode] = $sInputId;
$sValue = "".$oRequest->GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $value, '', 'attr_'.$sAttCode, '', $iFlags, $aArgs).' ';
- IssueLog::Info("sValue=".$sValue);
$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sValue);
}
$aHidden = array();
@@ -447,7 +527,6 @@ function RequestCreationForm($oP, $oUserOrg)
foreach ($aTemplateFields as $sAttCode => $oField)
{
$sValue = $oField->GetFormElement($oP, $sClass);
-
if ($oField->Get('input_type') == 'hidden')
{
$aHidden[] = $sValue;
@@ -475,14 +554,14 @@ EOF
$oP->add_linked_script("../js/jquery.blockUI.js");
$oP->add("\n");
$oP->add("\n");
- $oP->WizardFormStart('request_form', 1);
+ $oP->WizardFormStart('request_form', 4);
$oP->details($aDetails);
// Add hidden fields for known values, enabling dependant attributes to be computed correctly
//
foreach($oRequest->ListChanges() as $sAttCode => $value)
- {
+ {
if (!in_array($sAttCode, $aList))
{
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
@@ -508,7 +587,7 @@ EOF
$oP->add("
\n");
$iFieldsCount = count($aFieldsMap);
$sJsonFieldsMap = json_encode($aFieldsMap);
- // IssueLog::Info("sJsonFieldsMap=".$sJsonFieldsMap);
+
$oP->add_ready_script(
<<ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
$sTransactionId = utils::ReadPostedParam('transaction_id', '');
if (!utils::IsTransactionValid($sTransactionId))
@@ -634,8 +713,8 @@ function CreateRequest(WebPage $oP, Organization $oUserOrg)
{
switch($oP->GetWizardStep())
{
-// case 0:
-/* default:
+ case 0:
+ default:
SelectServiceCategory($oP, $oUserOrg);
break;
@@ -645,13 +724,13 @@ function CreateRequest(WebPage $oP, Organization $oUserOrg)
case 2:
SelectRequestTemplate($oP, $oUserOrg);
- break; */
+ break;
- case 0:
+ case 3:
RequestCreationForm($oP, $oUserOrg);
break;
- case 1:
+ case 4:
DoCreateRequest($oP, $oUserOrg);
break;
}
@@ -746,54 +825,6 @@ function ListResolvedRequests(WebPage $oP)
DisplayRequestLists($oP, $aClassToSet);
}
-/**
- * Lists all the currently resolved (not yet closed) User Requests for the current user
- * @param WebPage $oP The current web page
- * @return void
- */
-// ========================= THEBEN ===================================
-function ListRequestsToApprove(WebPage $oP)
-{
- $oUserOrg = GetUserOrg();
-
- $aClassToSet = array();
- foreach (GetTicketClasses() as $sClass)
- {
- $sOQL = "SELECT $sClass WHERE org_id = :org_id AND status = 'waiting_for_approval'";
- $oSearch = DBObjectSearch::FromOQL($sOQL);
- $iUser = UserRights::GetContactId();
-
- $oSearch->AddCondition('approver_id', $iUser);
-
- $aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
- }
- DisplayRequestLists($oP, $aClassToSet);
-}
-
-/**
- * Lists all the currently resolved (not yet closed) User Requests for the current user
- * @param WebPage $oP The current web page
- * @return void
- */
-// ========================= THEBEN ===================================
-function ListRequestsToResolve(WebPage $oP)
-{
- $oUserOrg = GetUserOrg();
-
- $aClassToSet = array();
- foreach (GetTicketClasses() as $sClass)
- {
- $sOQL = "SELECT $sClass WHERE org_id = :org_id AND status = 'assigned'";
- $oSearch = DBObjectSearch::FromOQL($sOQL);
- $iUser = UserRights::GetContactId();
-
- $oSearch->AddCondition('agent_id', $iUser);
-
- $aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
- }
- DisplayRequestLists($oP, $aClassToSet);
-}
-
/**
* Lists all the currently closed tickets
* @param WebPage $oP The current web page
@@ -865,8 +896,6 @@ function DisplayObject($oP, $oObj, $oUserOrg)
* @param Object $oObj The target object
* @return void
*/
-//============= THEBEN ============= ApproveButton === ResolveButton ===============
-
function ShowDetailsRequest(WebPage $oP, $oObj)
{
$sClass = get_class($oObj);
@@ -876,10 +905,6 @@ function ShowDetailsRequest(WebPage $oP, $oObj)
$bIsReopenButton = false;
$bIsCloseButton = false;
$bIsEscalateButton = false;
- $bIsApproveButton = false;
- $bIsRejectButton = false;
- $bIsResolveButton = false;
-
$bEditAttachments = false;
$aEditAtt = array(); // List of attributes editable in the main form
if (!MetaModel::DBIsReadOnly())
@@ -898,66 +923,16 @@ function ShowDetailsRequest(WebPage $oP, $oObj)
}
// Add the "Close" button if this is valid action
if (array_key_exists('ev_close', $aTransitions) && UserRights::IsStimulusAllowed($sClass, 'ev_close', $oSet))
- { if (($oObj->Get('caller_id') == UserRights::GetContactId())
- || IsPowerUSer()) {
- // I can only close a ticket if I'm the caller or a power user
- $bIsCloseButton = true;
- MakeStimulusForm($oP, $oObj, 'ev_close', array('user_satisfaction', $sUserCommentAttCode));
- }
- IssueLog::Info('caller_id='.$oObj->Get('caller_id')." user-id=".UserRights::GetContactId());
+ {
+ $bIsCloseButton = true;
+ MakeStimulusForm($oP, $oObj, 'ev_close', array('user_satisfaction', $sUserCommentAttCode));
}
break;
-
- case 'waiting_for_approval':
- $aEditAtt = array();
- $aTransitions = $oObj->EnumTransitions();
- $oSet = DBObjectSet::FromObject($oObj);
- // Add the "Approve" button if this is valid action
- if (array_key_exists('ev_approve', $aTransitions)) //TODO check if current user is approver && UserRights::IsStimulusAllowed($sClass, 'ev_reopen', $oSet))
- {
- $bIsApproveButton = true;
- MakeStimulusForm($oP, $oObj, 'ev_approve', array($sLogAttCode));
- }
- // Add the "Reject" button if this is valid action
- if (array_key_exists('ev_reject', $aTransitions)) // TODO check if current user is approve && UserRights::IsStimulusAllowed($sClass, 'ev_close', $oSet))
- {
- $bIsRejectButton = true;
- MakeStimulusForm($oP, $oObj, 'ev_reject', array($sLogAttCode) ); //array('user_satisfaction', $sUserCommentAttCode));
- }
- break;
case 'closed':
// By convention 'closed' is the final state of a ticket and nothing can be done in such a state
break;
- case 'assigned':
-
- $iFlags = $oObj->GetAttributeFlags($sLogAttCode);
- $bReadOnly = (($iFlags & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) != 0);
- if ($bReadOnly)
- {
- $aEditAtt = array();
- $bEditAttachments = false;
- }
- else
- {
- $aEditAtt = array(
- $sLogAttCode => '????'
- );
- $bEditAttachments = true;
- }
- if (isKeyUser()) {
- $aTransitions = $oObj->EnumTransitions();
- $oSet = DBObjectSet::FromObject($oObj);
- // Add the "Resolver" button if this is valid action
- if (array_key_exists('ev_resolve', $aTransitions)) //TODO check if current user is approver && UserRights::IsStimulusAllowed($sClass, 'ev_reopen', $oSet))
- {
- $bIsResolveButton = true;
- MakeStimulusForm($oP, $oObj, 'ev_resolve', array($sLogAttCode));
- }
- }
- break;
-
default:
// In all other states, the only possible action is to update the ticket (both the case log and the attachments)
// This update is possible only if the case log field is not read-only or hidden in the current state
@@ -1098,32 +1073,6 @@ EOF
$sOk = addslashes(Dict::S('UI:Button:Ok'));
$oP->p('