Compare commits
4 Commits
5569a72e68
...
b378c73152
| Author | SHA1 | Date | |
|---|---|---|---|
| b378c73152 | |||
| 09fa8fc604 | |||
| 87c447e935 | |||
| 630a3175ce |
@ -1,6 +1,7 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using PSTW_CentralSystem.DBContext;
|
using PSTW_CentralSystem.DBContext;
|
||||||
|
using PSTW_CentralSystem.Models;
|
||||||
|
|
||||||
namespace PSTW_CentralSystem.Controllers.API
|
namespace PSTW_CentralSystem.Controllers.API
|
||||||
{
|
{
|
||||||
@ -29,5 +30,98 @@ namespace PSTW_CentralSystem.Controllers.API
|
|||||||
var qcList = await _authDbContext.ModuleSettings.Where(x => x.SettingId == id).FirstOrDefaultAsync();
|
var qcList = await _authDbContext.ModuleSettings.Where(x => x.SettingId == id).FirstOrDefaultAsync();
|
||||||
return Json(qcList);
|
return Json(qcList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("addMethod")]
|
||||||
|
public async Task<IActionResult> AddMethod(int? id, string? module)
|
||||||
|
{
|
||||||
|
|
||||||
|
// Retrieve the module setting from the database
|
||||||
|
var moduleSetting = await _authDbContext.ModuleSettings
|
||||||
|
.Where(x => x.SettingId == id)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
if (moduleSetting == null)
|
||||||
|
{
|
||||||
|
return NotFound("Module setting not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize the list if null
|
||||||
|
if (moduleSetting.MethodAllowedUserType == null)
|
||||||
|
{
|
||||||
|
moduleSetting.MethodAllowedUserType = new List<MethodAllowedUserType>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the new module
|
||||||
|
moduleSetting.MethodAllowedUserType.Add(new MethodAllowedUserType
|
||||||
|
{
|
||||||
|
MethodName = module,
|
||||||
|
AllowedUserTypesArray = Array.Empty<string>()
|
||||||
|
});
|
||||||
|
|
||||||
|
// Save the changes to the database
|
||||||
|
_authDbContext.ModuleSettings.Update(moduleSetting);
|
||||||
|
await _authDbContext.SaveChangesAsync();
|
||||||
|
|
||||||
|
return Json(moduleSetting);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[HttpPost("saveData")]
|
||||||
|
public async Task<IActionResult> saveData([FromBody] ModuleSettingModel modelSettingList)
|
||||||
|
{
|
||||||
|
var qcList = await _authDbContext.ModuleSettings
|
||||||
|
.Where(x => x.SettingId == modelSettingList.SettingId)
|
||||||
|
.FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
if (qcList != null)
|
||||||
|
{
|
||||||
|
|
||||||
|
qcList.ModuleName = modelSettingList.ModuleName;
|
||||||
|
qcList.AllowedUserType = modelSettingList.AllowedUserType;
|
||||||
|
|
||||||
|
if (modelSettingList.MethodAllowedUserType != null)
|
||||||
|
{
|
||||||
|
qcList.MethodAllowedUserType = modelSettingList.MethodAllowedUserType
|
||||||
|
.Select(m => new MethodAllowedUserType
|
||||||
|
{
|
||||||
|
MethodName = m.MethodName,
|
||||||
|
AllowedUserTypesArray = m.AllowedUserTypesArray
|
||||||
|
}).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
qcList.ModuleStatus = modelSettingList.ModuleStatus;
|
||||||
|
qcList.Description = modelSettingList.Description;
|
||||||
|
|
||||||
|
_authDbContext.ModuleSettings.Update(qcList);
|
||||||
|
await _authDbContext.SaveChangesAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Json(qcList);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPost("AddModule")]
|
||||||
|
public async Task<IActionResult> AddModule([FromBody] ModuleSettingModel module)
|
||||||
|
{
|
||||||
|
if (!ModelState.IsValid)
|
||||||
|
{
|
||||||
|
return BadRequest(ModelState);
|
||||||
|
}
|
||||||
|
if (module == null)
|
||||||
|
{
|
||||||
|
return NotFound("Module is null");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_authDbContext.ModuleSettings.Add(module);
|
||||||
|
await _authDbContext.SaveChangesAsync();
|
||||||
|
var updatedList = await _authDbContext.ModuleSettings.ToListAsync();
|
||||||
|
return Json(updatedList);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return BadRequest(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,6 +42,12 @@ namespace PSTW_CentralSystem.Controllers
|
|||||||
|
|
||||||
return View(moduleSettings);
|
return View(moduleSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IActionResult AddModule()
|
||||||
|
{
|
||||||
|
return View();
|
||||||
|
}
|
||||||
|
|
||||||
public IActionResult ModuleCreate()
|
public IActionResult ModuleCreate()
|
||||||
{
|
{
|
||||||
return View();
|
return View();
|
||||||
|
|||||||
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.11.35327.3
|
VisualStudioVersion = 17.11.35327.3
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSTW_CentralSystem", "PSTW_CentralSystem.csproj", "{1B3D8BB0-F297-4F4B-8C09-6D97CE5D44F1}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PSTW_CentralSystem", "PSTW_CentralSystem.csproj", "{1B3D8BB0-F297-4F4B-8C09-6D97CE5D44F1}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|||||||
93
Views/Admin/AddModule.cshtml
Normal file
93
Views/Admin/AddModule.cshtml
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
|
||||||
|
@{
|
||||||
|
ViewData["Title"] = "Add Module";
|
||||||
|
Layout = "~/Views/Shared/_Layout.cshtml";
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="row" id="app">
|
||||||
|
<div class="col-md-12 col-lg-12">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="col-md-12 col-lg-12">
|
||||||
|
<form v-on:submit.prevent="">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title">Settings</h5>
|
||||||
|
<div class="form-group row">
|
||||||
|
<label class="col-md-3 mt-3">Module Name</label>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<input type="text" class="form-control" name="ModuleName" v-model="moduleData.ModuleName" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group row">
|
||||||
|
<label class="col-md-3 mt-3">Module Access</label>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<select class="form-select shadow-none mt-3" name="AllowedUserType" v-model="moduleData.AllowedUserType" style="height: 36px; width: 100%">
|
||||||
|
<optgroup label="General">
|
||||||
|
<option value="Public">Public</option>
|
||||||
|
<option value="Registered User">Registered User</option>
|
||||||
|
</optgroup>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="border-top">
|
||||||
|
<div class="card-body">
|
||||||
|
<button type="button" class="btn btn-primary" v-on:click="saveData">
|
||||||
|
Add
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@section Scripts {
|
||||||
|
@{
|
||||||
|
await Html.RenderPartialAsync("_ValidationScriptsPartial");
|
||||||
|
}
|
||||||
|
<script>
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
const app = Vue.createApp({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
moduleData:{
|
||||||
|
ModuleName : null,
|
||||||
|
AllowedUserType : null,
|
||||||
|
MethodAllowedUserType : null,
|
||||||
|
ModuleStatus : "1",
|
||||||
|
Description : null,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
saveData() {
|
||||||
|
fetch('/ModuleAPI/AddModule', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify(this.moduleData)
|
||||||
|
})
|
||||||
|
.then(response => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Name module already exist');
|
||||||
|
}
|
||||||
|
alert('Module information saved successfully');
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('There was a problem with the update operation:', error);
|
||||||
|
alert('Failed to save data: ' + error.message);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
$(function () {
|
||||||
|
app.mount('#app');
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
}
|
||||||
@ -45,7 +45,7 @@
|
|||||||
<option v-for="(methods, index) in availableMethod" :key="index" :value="methods">{{ methods }}</option>
|
<option v-for="(methods, index) in availableMethod" :key="index" :value="methods">{{ methods }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<button class="btn col-md-3 f-icon mt-3 d-flex align-items-center" style="height: 36px; width: auto">
|
<button class="btn col-md-3 f-icon mt-3 d-flex align-items-center" style="height: 36px; width: auto" v-on:click="addMethod(selectedModule)">
|
||||||
<i class=" fas fa-plus-square fa-lg"></i> Add method
|
<i class=" fas fa-plus-square fa-lg"></i> Add method
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -83,7 +83,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="border-top">
|
<div class="border-top">
|
||||||
<div class="card-body">
|
<div class="card-body" v-on:click="saveData">
|
||||||
<button type="button" class="btn btn-primary">
|
<button type="button" class="btn btn-primary">
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
@ -183,7 +183,10 @@
|
|||||||
if (data != null) {
|
if (data != null) {
|
||||||
this.roleData = data;
|
this.roleData = data;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
$(".select2").select2(); // Initialize Select2 after DOM update
|
$(".select2").select2().on("change", (event) => {
|
||||||
|
const index = $(event.target).closest('.tab-pane').index();
|
||||||
|
this.moduleData.methodAllowedUserType[index].allowedUserTypesArray = $(event.target).val();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -231,6 +234,47 @@
|
|||||||
console.error('Failed to delete module with status:', error);
|
console.error('Failed to delete module with status:', error);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
addMethod(module) {
|
||||||
|
var id = @Model.SettingId;
|
||||||
|
fetch('/ModuleAPI/addMethod?id=' + id + '&module=' + encodeURIComponent(module), {
|
||||||
|
method: 'POST'
|
||||||
|
})
|
||||||
|
.then(response => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('HTTP error! status: ' + response.status);
|
||||||
|
}
|
||||||
|
return response.json();
|
||||||
|
})
|
||||||
|
.then(data => {
|
||||||
|
console.log('Method added successfully:', data);
|
||||||
|
alert('Method added successfully');
|
||||||
|
this.fetchXModule(); // Refresh the module data
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('There was a problem when adding the module operation:', error);
|
||||||
|
alert('Failed to add method: ' + error.message);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
saveData() {
|
||||||
|
fetch('/ModuleAPI/saveData', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify(this.moduleData)
|
||||||
|
})
|
||||||
|
.then(response => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Failed to save module information');
|
||||||
|
}
|
||||||
|
alert('Module information saved successfully');
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('There was a problem with the update operation:', error);
|
||||||
|
alert('Failed to save data: ' + error.message);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
filterAvailableMethods() {
|
filterAvailableMethods() {
|
||||||
const moduleMethods = this.moduleData.methodAllowedUserType.map(method => method.methodName);
|
const moduleMethods = this.moduleData.methodAllowedUserType.map(method => method.methodName);
|
||||||
this.availableMethod = this.controllerMethodData.methods.filter(method => !moduleMethods.includes(method)); // exclude methods that are already in moduleMethods
|
this.availableMethod = this.controllerMethodData.methods.filter(method => !moduleMethods.includes(method)); // exclude methods that are already in moduleMethods
|
||||||
|
|||||||
@ -2,8 +2,9 @@
|
|||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
//"DefaultConnection": "Server=localhost;uid=root;Password='';Database=web_interface;"
|
//"DefaultConnection": "Server=localhost;uid=root;Password='';Database=web_interface;"
|
||||||
//"DefaultConnection": "server=175.136.244.102;user id=root;password=tw_mysql_root;port=3306;database=web_interface"
|
//"DefaultConnection": "server=175.136.244.102;user id=root;password=tw_mysql_root;port=3306;database=web_interface"
|
||||||
"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs;" //DB_dev connection
|
//"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs;", //DB_dev connection
|
||||||
//"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=intern;password='intern_mysql_acct';database=web_interface;"//DB_dev connection
|
//"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=intern;password='intern_mysql_acct';database=web_interface;"//DB_dev connection
|
||||||
|
"DefaultConnection": "Server=127.0.0.1;Port=3306;user=root;password=;database=pstw_cs;" //DB_dev connection - Arif Hilmi
|
||||||
},
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user