fixed config.json namespace bug and template .zip filename bug

vanderbilt-redcap · Sep 28, 2018 · e0e60b6 · e0e60b6
1 parent c7eebfc
commit e0e60b6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/vendor
diff --git a/Templater.php b/Templater.php
@@ -17,8 +17,12 @@ function generateTemplateFromPost($twig) {
 			'projectLinks' => []
 		];
 		$data['initialVersion'] = empty($_POST['moduleInitVersion']) ? '0.1' : $_POST['moduleInitVersion'];
-		preg_match_all('/[A-Z][a-z]+/', $data['className'], $matches);
-		$dirName = empty($_POST['dirName']) ? join('_', array_map('strtolower', $matches[0])) . '_v' . $data['initialVersion'] : $_POST['dirName'];
+
+		// determine directory name via given class name
+		// preg_match_all('/[A-Z][a-z]+/', $data['className'], $matches);
+		// $dirName = ($_POST['dirName']=="") ? join('_', array_map('strtolower', $matches[0])) . '_v' . $data['initialVersion'] : $_POST['dirName'];
+
+		$dirName = ($_POST['dirName']=="") ? 'module_template_v' . $data['initialVersion'] : $_POST['dirName'];
 
 		# authors
 		$done = false;

diff --git a/templates/config.twig b/templates/config.twig
@@ -1,7 +1,7 @@
 {
 	"name": "{{ className }}",
 
-	"namespace": "{{ namespace }}\\{{ className }}",
+	"namespace": "{{ namespace|replace({"\\": "\\\\"}) }}\\{{ className }}",
 
 	"description": "{{ description }}",
 

diff --git a/templates/newModule.twig b/templates/newModule.twig
@@ -181,6 +181,20 @@
 			<div id="cronsCardBody" class="card-body"></div>
 		</div>
 
+		<!-- System/Project Settings -->
+		<h5 class="text-center">Project/System Settings</h5>
+		<div class="row pb-4 align-items-center">
+			<button class = "btn btn-primary ml-5 mr-4" type="button" onclick="ExternalModuleTemplater.addTab('settings')">Add Setting</button>
+			<button class = "btn btn-primary" id="removeSettingButton" type="button" onclick="ExternalModuleTemplater.removeTab('settings')" disabled>Remove Setting</button>
+		</div>
+		<div id="settingsCard" style="display:none" class="mx-3 mb-3 p-2 card">
+			<div class="card-header">
+				<ul id="settingsTabHeads" class="nav nav-tabs card-header-tabs">
+				</ul>
+			</div>
+			<div id="settingsCardBody" class="card-body"></div>
+		</div>
+
 		<!-- LICENSE -->
 		<h5 class="text-center">License</h5>
 		<div class="mx-3 mb-3 p-2 card">