diff --git a/include/migrations/1027-deltager-note-json.sql b/include/migrations/1027-deltager-note-json.sql
new file mode 100644
index 00000000..deaf813f
--- /dev/null
+++ b/include/migrations/1027-deltager-note-json.sql
@@ -0,0 +1,2 @@
+UPDATE deltagere SET deltager_note = CONCAT('{"note" :"', deltager_note, '"}' );
+ALTER TABLE deltagere MODIFY deltager_note JSON;
\ No newline at end of file
diff --git a/include/migrations/1028-sober-sleeping.sql b/include/migrations/1028-sober-sleeping.sql
new file mode 100644
index 00000000..6c5da115
--- /dev/null
+++ b/include/migrations/1028-sober-sleeping.sql
@@ -0,0 +1,2 @@
+ALTER TABLE deltagere CHANGE dancing_with_the_clans sober_sleeping enum('ja','nej');
+ALTER TABLE deltagere DROP COLUMN game_reallocation_participant;
\ No newline at end of file
diff --git a/include/models/activity_model.php b/include/models/activity_model.php
index 09f74451..05a901db 100755
--- a/include/models/activity_model.php
+++ b/include/models/activity_model.php
@@ -171,50 +171,232 @@ public function opretAktivitet(RequestVars $post)
return $activity;
}
+
+ public function getActivityHeader(){
+ $activity = $this->createEntity('Aktiviteter');
+ $fields = $activity->getColumns();
+ $fields[] = 'age_min';
+ $fields[] = 'age_max';
+ return $fields;
+ }
+
+ public static function parseActivityData($data){
+ $result = [];
+ foreach ($data as $row) {
+ $result[] = self::parseActivityRow($row);
+ }
+ return $result;
+ }
+
+ public static function parseActivityRow($row){
+ for($i = 0; $i <= 26; $i++){
+ $row[$i] = isset($row[$i]) ? $row[$i] : "";
+ }
+
+ $result_row = [];
+ $result_row['id'] = is_numeric($row[26]) ? intval($row[26]) : null;
+ $result_row['navn'] = $row[1];
+ $result_row['kan_tilmeldes'] = preg_match("/nej/", strtolower($row[24])) == 1 ? 'nej' : 'ja';;
+ $result_row['note'] = $row[22];
+ $result_row['foromtale'] = $row[17];
+ preg_match("/\d+/", $row[12], $matches);
+ $result_row['varighed_per_afvikling'] = isset($matches[0]) ? $matches[0] : 0;
+ preg_match("/\d+/", $row[6], $matches);
+ $result_row['min_deltagere_per_hold'] = isset($matches[0]) ? $matches[0] : 0;
+ preg_match("/\d+/", $row[7], $matches);
+ $result_row['max_deltagere_per_hold'] = isset($matches[0]) ? $matches[0] : 0;
+ preg_match("/\d+/", $row[8], $matches);
+ $result_row['spilledere_per_hold'] = isset($matches[0]) ? $matches[0] : 0;
+ preg_match("/\d+/", $row[9], $matches);
+ $result_row['pris'] = isset($matches[0]) ? $matches[0] : 0;
+ $result_row['lokale_eksklusiv'] = preg_match("/nej/", strtolower($row[19])) == 1 ? 'nej' : 'ja';
+ $result_row['wp_link'] = is_numeric($row[26]) ? intval($row[26]) : 0;
+ $result_row['teaser_dk'] = $row[13];
+ $result_row['teaser_en'] = $row[14];
+ $result_row['title_en'] = $row[2];;
+ $result_row['description_en'] = $row[18];
+ $result_row['author'] = $row[3];;
+ // parsing type from input
+ $type = strtolower($row[4]);
+ if (preg_match("/junior/", $type)) {
+ $type = 'junior';
+ } elseif (preg_match("/live/", $type)) {
+ $type = 'live';
+ } elseif (preg_match("/brætspil|braet/", $type)) {
+ $type = 'braet';
+ } elseif(preg_match("/rolle(spil)?/", $type)) {
+ $type = 'rolle';
+ } elseif (preg_match("/figur/", $type)) {
+ $type = 'figur';
+ } elseif(preg_match("/magic/", $type)) {
+ $type = 'magic';
+ } elseif(preg_match("/workshop/", $type)) {
+ $type = 'workshop';
+ } elseif(preg_match("/system/", $type) || preg_match("/spillederbriefing/", strtolower($result_row['navn']))) {
+ $type = 'system';
+ } else {
+ $type = 'ottoviteter';
+ }
+ $result_row['type'] = $type;
+
+ $result_row['tids_eksklusiv'] = preg_match("/nej/", strtolower($row[20])) == 1 ? 'nej' : 'ja';
+
+ $sprog = preg_match("/d/", strtolower($row[5])) == 1 ? 'dansk' : '';
+ $engelsk = $sprog == '' ? 'engelsk' : '+engelsk';
+ $sprog .= preg_match("/e/", strtolower($row[5])) == 1 ? $engelsk : '';
+ $result_row['sprog'] = $sprog;
+
+ $result_row['replayable'] = preg_match("/ja/", strtolower($row[15])) == 1 ? 'nej' : 'ja'; // If not one-time event
+ $result_row['updated'] = self::parseDateTime($row[0]);
+ $result_row['hidden'] = preg_match("/ja/", strtolower($row[21])) == 1 ? 'ja' : 'nej';
+ preg_match("/\d/", $row[23], $matches);
+ $result_row['karmatype'] = isset($matches[0]) ? $matches[0] : 0;
+ preg_match("/\d+/", $row[16], $matches);
+ $result_row['max_signups'] = isset($matches[0]) ? $matches[0] : 0;
+ $result_row['age_min'] = $row[10];
+ $result_row['age_max'] = $row[11];
+
+ return $result_row;
+ }
+
+ /**
+ * Simple method for parsing timestamp or just give current time
+ *
+ * @return parsed timestamp or if parsing failed
+ */
+ private static function parseDateTime($dateTime){
+ // parse time
+ if (preg_match("/\b(\d{2})[:\.](\d{2})[:\.](\d{2})\b/",$dateTime, $matches)){
+ $time = "$matches[1]:$matches[2]:$matches[3]";
+ } else {
+ $time = date("H:i:s");
+ }
+
+ // parse date
+ if (preg_match("/(\d{4})[-\/](\d{2})[-\/](\d{2})/",$dateTime, $matches)){
+ $date = "$matches[1]-$matches[2]-$matches[3]";
+ } elseif (preg_match("/(\d{2})[-\/](\d{2})[-\/](\d{4})/",$dateTime, $matches)){
+ $date = "$matches[3]-$matches[2]-$matches[1]";
+ } else {
+ $date = date("Y-m-d");
+ }
+
+ return "$date $time";
+ }
- public function importActivities()
- {
- $activity = $this->createEntity('Aktiviteter');
- // Required values
- $activity->updated = date('Y-m-d H:i:s');
- $activity->navn = "Test";
- $activity->title_en = "Test";
- $activity->author = "Text";
- $activity->type = 'rolle';
- $activity->sprog = 'dansk';
- $activity->min_deltagere_per_hold = 1;
- $activity->max_deltagere_per_hold = 1;
- $activity->spilledere_per_hold = 1;
- $activity->pris = 0;
- $activity->varighed_per_afvikling = 1;
- $activity->teaser_dk = "TeaserDK";
- $activity->teaser_en = "TeaserEN";
- $activity->replayable = 'nej';
- $activity->max_signups = 0;
- $activity->foromtale = "foromtale"; // Can be null
- $activity->description_en = "DescriptionEN";
-
- // Default values:
- $activity->kan_tilmeldes = 'ja';
- $activity->note = NULL;
- $activity->lokale_eksklusiv = 'ja';
- $activity->wp_link = 0;
- $activity->tids_eksklusiv = 'ja';
-
- // Default values (which are not visible under "Opret Aktivitet")
- $activity->hidden = 'nej';
- $activity->karmatype = 0;
-
- if (!$activity->insert()) {
- return false;
+ public function saveActivities($data, $replace = false) {
+ if($replace === true) {
+ // Check if we have any afviklinger before trying to replace activities
+ if ($this->createEntity('Afviklinger')->findAll()
+ || $this->createEntity('AfviklingerMultiblok')->findAll())
+ {
+ throw new FrameworkException("Cannot replace activities after afviklinger has been created", 1);
+ }
+
+ $activity = $this->createEntity('Aktiviteter');
+ $activity->deleteAll();
}
-
- // Optional values:
- //$activity->setMinAge(7);
- //$activity->setMaxAge(50);
-
- return true;
- }
+
+ $errors = 0;
+ foreach($data as $row) {
+ $activity = $this->createEntity('Aktiviteter');
+ if (!$replace) {
+ $exists = $activity->findById($row['id']);
+ } else {
+ $exists = false;
+ }
+
+ foreach ($row as $key => $value){
+ if ($key === 'age_min' || $key === 'age_max'){
+ continue;
+ }
+
+ $activity->$key = $value;
+ }
+
+ if ($exists) {
+ $activity->update();
+ } else {
+ $activity->insert();
+ }
+
+ // Values that have to be set after the activity is inserted
+ // since they are in a different table with foreign key constraint
+ if ($row['age_min'] !== '') {
+ $activity->setMinAge($row['age_min']);
+ }
+ if ($row['age_max'] !== '') {
+ $activity->setMaxAge($row['age_max']);
+ }
+ }
+ }
+
+ /**
+ * Load all activities from database
+ * for use with export function
+ */
+ public function loadActivities()
+ {
+ $activity = $this->createEntity('Aktiviteter');
+ //$columns = $activity->getColumns();
+ $activities = $activity->findAll();
+ $columns = [
+ 'updated', //0
+ 'navn', //1
+ 'title_en', //2
+ 'author', //3
+ 'type', //4
+ 'sprog', //5
+ 'min_deltagere_per_hold', //6
+ 'max_deltagere_per_hold', //7
+ 'spilledere_per_hold', //8
+ 'pris', //9
+ 'age_min', //10
+ 'age_max', //11
+ 'varighed_per_afvikling', //12
+ 'teaser_dk', //13
+ 'teaser_en', //14
+ 'onetime', //15 inverse of replayable
+ 'max_signups', //16
+ 'foromtale', //17
+ 'description_en', //18
+ 'lokale_eksklusiv', //19
+ 'tids_eksklusiv', //20
+ 'hidden', //21
+ 'note', //22
+ 'karmatype', //23
+ 'kan_tilmældes', //24
+ 'wp_link', //25
+ 'id', //26
+ ];
+
+ $list[] = $columns;
+ foreach ($activities as $activity) {
+ $fields = [];
+ foreach ($columns as $column){
+ switch($column) {
+ case 'age_min':
+ $age = $activity->getMinAge();
+ $fields[] = $age == false ? '' : $age;
+ break;
+ case 'age_max':
+ $age = $activity->getMaxAge();
+ $fields[] = $age == false ? '' : $age;
+ break;
+ case 'onetime':
+ $fields[] = $activity->replayable == 'nej' ? 'ja' : 'nej';
+ break;
+ default:
+ $fields[] = str_replace("\"","''",$activity->$column);
+ }
+ }
+ $list[] = $fields;
+ }
+
+ //usort($activities[$type], function($a, $b) {return strcmp($a->navn, $b->navn);});
+ return $list;
+ }
+
/**
* creates a scheduling for an activity with data from POST
diff --git a/include/models/api_model.php b/include/models/api_model.php
index 358e79ff..a3269adb 100755
--- a/include/models/api_model.php
+++ b/include/models/api_model.php
@@ -914,7 +914,7 @@ public function addActivity(array $json, $deltager = null) {
foreach ($json['activity'] as $activity) {
$schedule = $this->createEntity('Afviklinger')->findById($activity['schedule_id']);
- if (intval($activity['priority']) === 4) {
+ if (intval($activity['priority']) === 5) {
$deltager->setAktivitetTilmelding($schedule, 1, 'spiller');
$deltager->setAktivitetTilmelding($schedule, 0, 'spilleder');
@@ -980,21 +980,18 @@ public function parseSignupData(array $data, DBObject $participant)
$e->logException();
return ['Could not update database with participant data'];
-
}
$errors = array();
if (!empty($data['wear']) && is_array($data['wear'])) {
$errors[] = $this->addWear($data, $participant);
-
} else {
$errors[] = $this->addWear(['wear' => []], $participant);
}
if (!empty($data['activity']) && is_array($data['activity'])) {
$errors[] = $this->addActivity($data, $participant);
-
} else {
$errors[] = $this->addActivity(['activity' => []], $participant);
}
@@ -1005,14 +1002,12 @@ public function parseSignupData(array $data, DBObject $participant)
if (!empty($data['gds']) && is_array($data['gds'])) {
$errors[] = $this->addGDS($data, $participant);
-
} else {
$errors[] = $this->addGDS(['gds' => []], $participant);
}
if (!empty($data['food']) && is_array($data['food'])) {
$errors[] = $this->addFood($data, $participant);
-
} else {
$errors[] = $this->addFood(['food' => []], $participant);
}
@@ -1167,9 +1162,8 @@ protected function setParticipantData(DBObject $participant, array $data)
'may_contact',
'desired_activities',
'desired_diy_shifts',
- 'game_reallocation_participant',
- 'dancing_with_the_clans',
'sovesal',
+ 'sober_sleeping',
'ungdomsskole',
'original_price',
'scenarie',
@@ -1195,6 +1189,8 @@ protected function setParticipantData(DBObject $participant, array $data)
$participant->brugerkategori_id = $bk->id;
}
+ $participant->note = $this->createEntity('Deltagere')->parseNote($participant->deltager_note);
+
return $this;
}
@@ -1524,8 +1520,8 @@ public function getParticipantBaseData(DBObject $participant)
'may_contact' => $participant->may_contact,
'desired_activities' => $participant->desired_activities,
'desired_diy_shifts' => $participant->desired_diy_shifts,
- 'game_reallocation_participant' => $participant->game_reallocation_participant,
'sovesal' => $participant->sovesal,
+ 'sober_sleeping' => $participant->sovesal,
'ungdomsskole' => $participant->ungdomsskole,
'original_price' => $participant->original_price,
'scenarie' => $participant->scenarie,
diff --git a/include/models/food_model.php b/include/models/food_model.php
index 64b0177a..53bab0b9 100755
--- a/include/models/food_model.php
+++ b/include/models/food_model.php
@@ -486,10 +486,10 @@ public function updateFoodHandoutTimes()
foreach ($this->createEntity('Mad')->findAll() as $food) {
foreach ($food->getMadtider() as $madtid) {
if ($madtid->isDinner()) {
- $usage[$madtid->dato] = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0);
+ $usage[$madtid->dato] = array(1 => 0, 2 => 0, 3 => 0, 4 => 0);
} elseif ($madtid->isLunch()) {
- $usage[$madtid->dato] = array(1 => 0, 2 => 0, 3 => 0, 4 => 0, 5 => 0);
+ $usage[$madtid->dato] = array(1 => 0, 2 => 0, 3 => 0, 4 => 0);
}
}
diff --git a/include/models/participant_model.php b/include/models/participant_model.php
index b29ac32d..6ebd66ca 100755
--- a/include/models/participant_model.php
+++ b/include/models/participant_model.php
@@ -201,6 +201,8 @@ public function miniWildCardSearch($terms, $exclude_phone = false) {
$select->setWhereOr('ungdomsskole', 'like', "%{$term}%");
$select->setWhereOr('scenarie', 'like', "%{$term}%");
$select->setWhereOr('arbejdsomraade', 'like', "%{$term}%");
+ $select->setWhereOr('skills', 'like', "%{$term}%");
+ $select->setWhereOr('deltager_note', 'like', "%{$term}%");
}
}
@@ -658,6 +660,7 @@ public function createDeltager(RequestVars $post)
'supergds',
'flere_gdsvagter',
'sovesal',
+ 'sober_sleeping',
'udeblevet',
'rabat',
'forfatter',
@@ -667,7 +670,6 @@ public function createDeltager(RequestVars $post)
'ready_mandag',
'ready_tirsdag',
'may_contact',
- 'game_reallocation_participant',
'interpreter',
'annulled',
);
@@ -1085,11 +1087,15 @@ protected function indgangMadDeletes($array_name, $entity_name, $field_name, Req
*/
public function updateDeltagerNote($deltager, $field, RequestVars $post)
{
- if (!in_array($field, array('deltager_note', 'admin_note', 'beskeder', 'paid_note', 'medical_note'))) {
- return false;
- }
+ if (preg_match("/deltager_note_(\w+)/", $field, $matches)) {
+ $deltager->setNote($matches[1], $post->$field);
+ } else{
+ if (!in_array($field, array('deltager_note', 'admin_note', 'beskeder', 'paid_note', 'medical_note'))) {
+ return false;
+ }
- $deltager->$field = $post->$field;
+ $deltager->$field = $post->$field;
+ }
return $deltager->update();
}
@@ -1849,36 +1855,40 @@ public function makeJeditableUpdate(Deltagere $participant, RequestVars $post)
$this->factory('IdTemplate')->cleanIdTemplateParticipantCache($participant);
- switch ($post->id) {
- case 'birthdate':
- $parsed = strtotime($post->value);
- $participant->birthdate = $parsed ? date('Y-m-d', $parsed) : '0000-00-00';
- break;
- case 'address':
- $participant->adresse1 = $post->value;
- break;
- case 'name':
- $parts = explode(' ', $post->value);
- if (count($parts) > 1) {
- $participant->efternavn = array_pop($parts);
- $participant->fornavn = implode(' ', $parts);
- } else {
- $participant->fornavn = $parts[0];
- $participant->efternavn = '';
- }
- break;
- case 'brugerkategori_id':
- $category = $this->createEntity('BrugerKategorier')->findById($post->value);
- $return_value = $category->navn;
- $participant->brugerkategori_id = $category->id;
- break;
+ if (preg_match("/deltager_note_(\w+)/",$post->id, $matches)) {
+ $participant->setNote($matches[1], $post->value);
+ } else {
+ switch ($post->id) {
+ case 'birthdate':
+ $parsed = strtotime($post->value);
+ $participant->birthdate = $parsed ? date('Y-m-d', $parsed) : '0000-00-00';
+ break;
+ case 'address':
+ $participant->adresse1 = $post->value;
+ break;
+ case 'name':
+ $parts = explode(' ', $post->value);
+ if (count($parts) > 1) {
+ $participant->efternavn = array_pop($parts);
+ $participant->fornavn = implode(' ', $parts);
+ } else {
+ $participant->fornavn = $parts[0];
+ $participant->efternavn = '';
+ }
+ break;
+ case 'brugerkategori_id':
+ $category = $this->createEntity('BrugerKategorier')->findById($post->value);
+ $return_value = $category->navn;
+ $participant->brugerkategori_id = $category->id;
+ break;
- case 'participant-template':
- $this->updateParticipantIdTemplate($participant, intval($post->value));
- break;
+ case 'participant-template':
+ $this->updateParticipantIdTemplate($participant, intval($post->value));
+ break;
- default:
- $participant->{$post->id} = $post->value;
+ default:
+ $participant->{$post->id} = $post->value;
+ }
}
$this->log("Deltager #{$participant->id} fik opdateret " . $post->id . " af {$this->getLoggedInUser()->user}", 'Deltager', $this->getLoggedInUser());
@@ -2428,11 +2438,12 @@ public function setupSignupEmail(DBObject $participant, Page $page)
$page->participant_photo_upload_link = $this->getPhotoUploadLink($participant);
}
- if ($participant->speaksDanish() && $lang !== 'en') {
- $page->end_signup_changes_date = date('d/m-Y', $paytime + 7 * 86400);
- } else {
- $page->end_signup_changes_date = date('M d, Y', $paytime + 7 * 86400);
- }
+ $page->end_signup_changes_date = $page->payment_day;
+ // if ($participant->speaksDanish() && $lang !== 'en') {
+ // $page->end_signup_changes_date = date('d/m-Y', $paytime + 7 * 86400);
+ // } else {
+ // $page->end_signup_changes_date = date('M d, Y', $paytime + 7 * 86400);
+ // }
return $participant;
}
@@ -3027,4 +3038,39 @@ public function findDoubleBookedParticipants()
return $participants;
}
+
+ /**
+ * fetches a participant from a photo identifier
+ *
+ * @param string $identifier identifier to search by
+ *
+ * @access public
+ * @return null|Deltagere
+ */
+ public function getParticipantFromPhotoidentifier($identifier)
+ {
+ $query = "SELECT participant_id FROM participantphotoidentifiers WHERE LOWER(identifier) = LOWER(?)";
+
+ $participant = null;
+
+ if ($results = $this->db->query($query, array($identifier))) {
+ $participant = $this->createEntity('Deltagere')->findById($results[0]['participant_id']);
+ }
+
+ return $participant;
+ }
+
+ public function findPeopleNeedingRefund(){
+ $participants = $this->createEntity('Deltagere')->findAll();
+
+ foreach($participants as $participant) {
+ $participant->difference = $participant->calcRealTotal() - $participant->betalt_beloeb;
+ if ($participant->difference < 0) {
+ $refundees[] = $participant;
+ }
+ }
+
+ return $refundees;
+ }
+
}
diff --git a/include/models/wear_model.php b/include/models/wear_model.php
index 1f7a2556..2bceaa7e 100755
--- a/include/models/wear_model.php
+++ b/include/models/wear_model.php
@@ -35,6 +35,8 @@
class WearModel extends Model
{
+ public $allOrganizerCategory = "Alle arrangører";
+
/**
* returns array of info on ordered wear
*
@@ -52,21 +54,19 @@ public function getWearBreakdown()
$select = $this->createEntity('DeltagereWear')->getSelect();
$select->setFrom('wearpriser')->
setTableWhere('wearpriser.id','deltagere_wear.wearpris_id')->
- setGroupBy('wearpris_id')->
setGroupBy('size')->
setGroupBy('wear_id')->
- setField('wearpris_id')->
setField('size')->
setField('wear_id')->
setField('SUM(antal) AS antal',false)->
- setOrder('wearpris_id','asc')->
+ setOrder('wear_id','asc')->
setOrder('size','asc');
$DB = $this->db;
if ($result = $DB->query($select))
{
foreach ($result as $row)
{
- $results[$row['wearpris_id']][] = $row;
+ $results[$row['wear_id']][] = $row;
}
}
return $results;
@@ -96,17 +96,16 @@ public function getAllWear()
}
/**
- * returns all WearPriser entities
+ * returns all Wear entities
*
* @access public
* @return array
*/
- public function getAllWearprices()
+ public function getAllWearTypes()
{
- $select = $this->createEntity('WearPriser')->getSelect();
- $select->setOrder('wear_id','asc');
- $select->setOrder('brugerkategori_id','asc');
- return $this->createEntity('WearPriser')->findBySelectMany($select);
+ $select = $this->createEntity('Wear')->getSelect();
+ $select->setOrder('id','asc');
+ return $this->createEntity('Wear')->findBySelectMany($select);
}
/**
@@ -152,7 +151,8 @@ public function getWearOrders($type = null, $size = null)
$select = $dw->getSelect();
if ($type)
{
- $select->setWhere('wearpris_id','=',$type);
+ $select->setLeftJoin('wearpriser', 'wearpris_id', 'id');
+ $select->setWhere('wear_id','=',$type);
}
if ($size)
{
@@ -240,35 +240,56 @@ protected function updatePrices(Wear $wear, RequestVars $post)
{
$priser = $wear->getWearpriser();
$pris_index = array_flip($this->extractIds($priser));
+ $categories = array_flip($this->extractIds($priser, 'brugerkategori_id'));
$success = true;
if (!empty($post->wearpriceid) && !empty($post->wearprice_category) && !empty($post->wearprice_price)) {
+ // Is the special all organizer category set?
+ if (false !== $key = array_search(0, $post->wearprice_category)){
+ $organizer_price = $post->wearprice_price[$key];
+ $organizers = $this->getAllOrganizerCategories();
+ $org_ids = [];
+ foreach ($organizers as $org) {
+ $org_ids[$org->id] = true;
+ }
+ }
+
foreach ($post->wearpriceid as $index => $id) {
- if (isset($pris_index[$id])) {
- $wearprice = $priser[$pris_index[$id]];
- $wearprice->pris = $post->wearprice_price[$index];
+ $category = $post->wearprice_category[$index];
+
+ // Don't add seperate price for the "all organizers" category
+ if ($category === '0') continue;
+
+ // Do we use organizer price
+ if (isset($org_ids[$category])) {
+ $price = $organizer_price;
+ unset($org_ids[$category]);
+ } else {
+ $price = $post->wearprice_price[$index];
+ }
+
+ if (isset($categories[$category])) {
+ $wearprice = $priser[$categories[$category]];
+ $wearprice->pris = $price;
$wearprice->update();
- unset($priser[$pris_index[$id]]);
+ unset($priser[$categories[$category]]);
continue;
} elseif ($id > 0) {
continue;
-
}
$new_wearprice = $this->createEntity('WearPriser');
$new_wearprice->wear_id = $wear->id;
- $new_wearprice->brugerkategori_id = $post->wearprice_category[$index];
- $new_wearprice->pris = $post->wearprice_price[$index];
+ $new_wearprice->brugerkategori_id = $category;
+ $new_wearprice->pris = $price;
if (!$new_wearprice->insert()) {
$success = false;
}
-
}
-
}
if (!$success) {
@@ -276,11 +297,29 @@ protected function updatePrices(Wear $wear, RequestVars $post)
}
foreach ($priser as $pris) {
- $pris->delete();
+ if (isset($org_ids[$pris->brugerkategori_id])) {
+ $pris->pris = $organizer_price;
+ $pris->update();
+ unset($org_ids[$pris->brugerkategori_id]);
+ } else {
+ $pris->delete();
+ }
+ }
+
+ if (is_array($org_ids)) {
+ foreach ($org_ids as $id => $value) {
+ $new_wearprice = $this->createEntity('WearPriser');
+ $new_wearprice->wear_id = $wear->id;
+ $new_wearprice->brugerkategori_id = $id;
+ $new_wearprice->pris = $organizer_price;
+ if (!$new_wearprice->insert()) {
+ $success = false;
+ }
+ }
}
- return true;
+ return $success;
}
/**
@@ -291,7 +330,26 @@ protected function updatePrices(Wear $wear, RequestVars $post)
*/
public function getAllParticipantCategories()
{
- return (($return = $this->createEntity('BrugerKategorier')->findAll()) ? $return : array());
+ $category = $this->createEntity('BrugerKategorier');
+ $categories = $category->findAll();
+ $categories = $categories ? $categories : array();
+ $category->navn = $this->allOrganizerCategory;
+ $category->id = 0;
+ $categories[] = $category;
+
+ return $categories;
+ }
+
+ public function getAllOrganizerCategories(){
+ $category = $this->createEntity('BrugerKategorier');
+ $categories = $category->findAll();
+ $categories = $categories ? $categories : array();
+ foreach($categories as $key => $category){
+ if (!$category->isArrangoer()){
+ unset($categories[$key]);
+ }
+ }
+ return $categories;
}
/**
diff --git a/include/templates/activity/importactivities.phtml b/include/templates/activity/importactivities.phtml
deleted file mode 100644
index 3c606d1b..00000000
--- a/include/templates/activity/importactivities.phtml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- Importer Aktiviteter
-
-
-
+
+ Eksporter Aktiviteter
+
+
+
+
+ Importer Aktiviteter
+
+
Bemærk det er vigtigt at kolonner står i den rigtige rækkefølge.
+
+
Man vil kunne se resultatet af importen inden man vælger at lægge det i databasen
+
+
+ activity_data)) { ?>
+
+ Herunder kan du se de data infosys har læst fra arket
+ Vil du fjene de aktiviteter der allerede ligger i databasen og ersatte med dem du har uploadet
+
+
+
+
+ activity_header as $header) { ?>
+
+ activity_data as $row){ ?>
+
+ $cell) {
+ if($key == "updated") {
+ $cell = preg_replace("/ /"," ",$cell);
+ $cell = preg_replace("/-/","‑",$cell);
+ }
+ $class = strlen($cell) > 100 ? 'class="long-text"' : '';
+ ?>
+ >
+
+
+
+
+
Overnatning (alle dage) Indgang onsdag 28/3 Indgang onsdag 8/4 Overnatning onsdag 28/3 Overnatning onsdag 8/4 Indgang torsdag 29/3 Indgang torsdag 9/4 Overnatning torsdag 29/3 Overnatning torsdag 9/4 Indgang fredag 30/3 Indgang fredag 10/4 Overnatning fredag 30/3 Overnatning fredag 10/4 Indgang lørdag 31/3 Indgang lørdag 11/4 Overnatning lørdag 31/3 Overnatning lørdag 11/4 Indgang søndag 1/4 Indgang søndag 12/4 Overnatning søndag 1/4 Overnatning søndag 12/4 Jeg vil spille på dansk: participant->sprog, 'dansk') !== false ? 'Ja' : 'Nej';?> Jeg vil spille på engelsk: participant->sprog, 'engelsk') !== false ? 'Ja' : 'Nej';?> Jeg vil spille på skandinavisk: participant->sprog, 'skandinavisk') !== false ? 'Ja' : 'Nej';?> Vil gerne med-arrangere Fastaval 2020: participant->arrangoer_naeste_aar === 'ja' ? 'Ja' : 'Nej';?> Vil gerne med-arrangere Fastaval 2021: participant->arrangoer_naeste_aar === 'ja' ? 'Ja' : 'Nej';?> Klargøre skolen fra mandag: participant->ready_mandag === 'ja' ? 'Ja' : 'Nej';?> Klargøre skolen fra tirsdag: participant->ready_tirsdag === 'ja' ? 'Ja' : 'Nej';?> Jeg vil være simultantolk: participant->interpreter === 'ja' ? 'Ja' : 'Nej';?> Jeg vil gerne have en plads i arrangørsovesalen: Ja Evner/skills du kan og vil hjælpe med: participant->skills);?> Jeg vil gerne sove i sovesal for ædru personer: Ja Andre kommentarer: participant->deltager_note);?> Evner/skills du kan og vil hjælpe med: participant->skills)?> name?>: content))?> Andre kommentarer: participant->deltager_note)?> Rig tante/onkel (støtter Fastaval med 300kr.) Ja Sleeping area (all-days) Entrance Wednesday 28/3 Entrance Wednesday 8/4 Sleeping area Wednesday 28/3 Sleeping area Wednesday 8/4 Entrance Thursday 29/3 Entrance Thursday 9/4 Sleeping area Thursday 29/3 Sleeping area Thursday 9/4 Entrance Friday 30/3 Entrance Friday 10/4 Sleeping area Friday 30/3 Sleeping area Friday 10/4 Entrance Saturday 31/3 Entrance Saturday 11/4 Sleeping area Saturday 31/3 Sleeping area Saturday 11/4 Entrance Sunday 1/4 Entrance Sunday 12/4 Sleeping area Sunday 1/4 Sleeping area Sunday 12/4 I want to play in Danish: participant->sprog, 'dansk') !== false ? 'Yes' : 'No';?> I want to play in English: participant->sprog, 'engelsk') !== false ? 'Yes' : 'No';?> I want to play in Scandinavian: participant->sprog, 'skandinavisk') !== false ? 'Yes' : 'No';?> I want to be part of organizing Fastaval 2020: participant->arrangoer_naeste_aar === 'ja' ? 'Yes' : 'No';?> I want to be part of organizing Fastaval 2021: participant->arrangoer_naeste_aar === 'ja' ? 'Yes' : 'No';?> I will help setup the place Monday: participant->ready_mandag === 'ja' ? 'Yes' : 'No';?> I will help setup the place Tuesday: participant->ready_tirsdag === 'ja' ? 'Yes' : 'No';?> I can help translate on-site: participant->interpreter === 'ja' ? 'Yes' : 'No';?> I would like a spot in the organisers sleeping area: Yes I would like a spot in the organisers sleeping area: Yes I would like to sleep in the area for sober people: Yes Any skills you can and would like to help Fastaval with: participant->skills);?> Other comments: participant->deltager_note);?> name_en?>: content))?> Other comments: participant->deltager_note);?> I am a rich aunty/uncle (supporting Fastaval with 300kr.) Yes Mad udleveret:
- food_data['received'] as $type => $count) :?>
- : :
diff --git a/include/templates/participant/sendsignupemail.phtml b/include/templates/participant/sendsignupemail.phtml
index 7e97c5da..19b4da21 100644
--- a/include/templates/participant/sendsignupemail.phtml
+++ b/include/templates/participant/sendsignupemail.phtml
@@ -211,11 +211,20 @@ case 'a':
participant->sovesal === 'ja') : ?>
Jeg vil gerne have en plads i arrangørsovesalen: Ja Jeg vil gerne sove i sovesal for ædru personer: Ja Evner/skills du kan og vil hjælpe med: participant->skills);?> Andre kommentarer: participant->deltager_note);?> name?>: content))?> Andre kommentarer: participant->deltager_note)?> Rig onkel (støtter Fastaval med 300kr.) Ja I need a space in the volunteers sleeping area: Yes I would like to sleep in the area for sober people: Yes Skills you would like to help with at Fastaval: participant->skills);?> Other comments: participant->deltager_note);?> name_en?>: content))?> Other comments: participant->deltager_note);?> Rich uncle (supporting Fastaval with 300kr.) Yes Deltagere der skal have penge tilbage
+rfundees)) : ?>
+Ingen fundet
+
+Deltagere:
+
+
diff --git a/include/templates/participant/visdeltager.phtml b/include/templates/participant/visdeltager.phtml
index 08175dc7..c43f1ca5 100755
--- a/include/templates/participant/visdeltager.phtml
+++ b/include/templates/participant/visdeltager.phtml
@@ -93,11 +93,14 @@ $this->registerLateLoadJS('participant.js');
Arr. næste år: deltager->arrangoer_naeste_aar;?>
Arr. sovesal: deltager->sovesal;?>
- Forfatter: deltager->forfatter;?>
+ Ædru sovesal: deltager->sober_sleeping;?>
+ Forfatter: deltager->forfatter;?>
Ønsket antal aktiviteter: deltager->desired_activities);?>
Ønsket antal GDS: deltager->desired_diy_shifts);?>
+
+
Simultantolk: deltager->interpreter);?>
@@ -106,14 +109,12 @@ $this->registerLateLoadJS('participant.js');
Udeblevet: deltager->udeblevet;?>
- Karma: participant_karma;?>
Annulleret: deltager->annulled === 'ja') :?>style='color: #ffffff;background-color: #ff0000;'>deltager->annulled);?> Aktivitets-låst: deltager->activity_lock);?>
Tilmeldt: late_signup) :?>deltager->signed_up));?>
Checked in: deltager->checkin_time) ? date('Y-m-d H:i', strtotime($this->deltager->checkin_time)) : 'Ikke tjekket ind';?>
- Aktivitets-låst: deltager->activity_lock);?>
deltager->admin_note, ENT_QUOTES));?>
-
-
- Deltagerens noter (til Fastaval) - Ret/slet
- deltager->deltager_note, ENT_QUOTES));?>
-
-
Beskeder til deltageren (fra Fastaval) - Ret/slet
@@ -343,6 +338,16 @@ $this->registerLateLoadJS('participant.js');
+ deltager->note) : ?>
+ deltager->note as $key => $note) : ?>
+
+
+ name?> - Ret/slet
+ content, ENT_QUOTES));?>
+
+
Må kontaktes: genSelect('deltager[may_contact]', array('nej', 'ja'), $this->deltager->may_contact);?>
+ Ædru sovesal: genSelect('deltager[sober_sleeping]',array('nej','ja'), $this->deltager->sober_sleeping);?>Forfatter: genSelect('deltager[forfatter]',array('nej', 'ja'), $this->deltager->forfatter);?>
@@ -72,7 +73,7 @@
Ønsket antal aktiviteter: Ønsket antal GDS: Simultantolk: genSelect('deltager[interpreter]', array('nej', 'ja'), $this->deltager->dancing_with_the_clans);?>Simultantolk: genSelect('deltager[interpreter]', array('nej', 'ja'), $this->deltager->interpreter);?>
Udeblevet: genSelect('deltager[udeblevet]',array('nej','ja'), $this->deltager->udeblevet);?>Simultantolk: genSelect('deltager[interpreter]', array('nej', 'ja'));?>
+ Ædru sovesal: genSelect('deltager[sober_sleeping]',array('nej','ja'));?>Udeblevet: genSelect('deltager[udeblevet]',array('nej','ja'));?>SuperGM: genSelect('deltager[supergm]', array('nej','ja'));?>
diff --git a/include/templates/participant/vistextedit.phtml b/include/templates/participant/vistextedit.phtml
index fd8df94c..50ea1600 100755
--- a/include/templates/participant/vistextedit.phtml
+++ b/include/templates/participant/vistextedit.phtml
@@ -2,7 +2,7 @@
Rediger field;?>
diff --git a/include/templates/wear/editwear.phtml b/include/templates/wear/editwear.phtml
index 30a0729e..21793670 100755
--- a/include/templates/wear/editwear.phtml
+++ b/include/templates/wear/editwear.phtml
@@ -19,10 +19,23 @@
wear->getWearpriser()) :
- foreach ($result as $price) : ?>
+ if ($result = $this->wear->getWearpriserSquashed()) :
+ foreach ($result as $price) :
+ if ($price->brugerkategori_id == 0) {
+ $navn = $this->model->allOrganizerCategory;
+ } else {
+ $navn = $price->getCategory()->navn;
+ }
+
+ ?>
-
+
diff --git a/include/templates/wear/showwear.phtml b/include/templates/wear/showwear.phtml
index 53e2e557..5f3dfecb 100755
--- a/include/templates/wear/showwear.phtml
+++ b/include/templates/wear/showwear.phtml
@@ -19,12 +19,17 @@
wear->getWearpriser()) :
+ if ($prices = $this->wear->getWearpriserSquashed()) :
foreach ($prices as $price) :
+ if ($price->brugerkategori_id == 0) {
+ $navn = $this->model->allOrganizerCategory;
+ } else {
+ $navn = $price->getCategory()->navn;
+ }
?>
id;?>
- getCategory()->navn;?>
+ pris;?>
- wear_pricetypes as $key => $price) :
+ wear_types as $key => $wear) :
$ialt = 0;
?>
- getWear()->navn;?>, getCategory()->navn;?>
- wear_data[$price->id])) :
+ navn;?>
+ wear_data[$wear->id])) :
foreach ($this->sizes as $size) :?>
0
sizes as $size) :
$col_done = false;
- foreach ($this->wear_data[$price->id] as $data) :
- if ($data['size'] == $size && $data['wearpris_id'] == $price->id) : ?>
+ foreach ($this->wear_data[$wear->id] as $data) :
+ if ($data['size'] == $size && $data['wear_id'] == $wear->id) : ?>
-