From 30dd5afac6a51ed8b4859e1df7a77b0c0fc41658 Mon Sep 17 00:00:00 2001
From: Misael Jonathan <misaeljonathan17@gmail.com>
Date: Fri, 6 Dec 2019 20:28:28 +0700
Subject: [PATCH] migrations conflict fix, delete console log
---
assets/js/EditProfile.jsx | 2 -
assets/js/NotificationPage.jsx | 3 -
assets/js/ProfilePage.jsx | 2 -
assets/js/components/VacancyList.jsx | 2 -
core/migrations/0001_initial.py | 217 +++++++++++++++++++++++++++
5 files changed, 217 insertions(+), 9 deletions(-)
create mode 100644 core/migrations/0001_initial.py
diff --git a/assets/js/EditProfile.jsx b/assets/js/EditProfile.jsx
index e8f155a8..55cb007c 100644
--- a/assets/js/EditProfile.jsx
+++ b/assets/js/EditProfile.jsx
@@ -98,7 +98,6 @@ export default class EditProfile extends ProfileHandler {
: this.props.params.id;
return Server.get(`/students/${id}/`).then(
(data) => {
- console.log("[DATA] => ", data)
this.setState({
id: data.id,
name: data.full_name,
@@ -169,7 +168,6 @@ export default class EditProfile extends ProfileHandler {
handleSubmit = (e) => {
e.preventDefault();
- console.log('[GITHUB] : ', this.state.form)
if (!isFromGithubLinkValid(this.state.form.github_url)) {
this.modalAlert.open(
'Pembaharuan profil gagal',
diff --git a/assets/js/NotificationPage.jsx b/assets/js/NotificationPage.jsx
index 88f510db..38e0a58b 100644
--- a/assets/js/NotificationPage.jsx
+++ b/assets/js/NotificationPage.jsx
@@ -36,7 +36,6 @@ export default class NotificationPage extends React.Component {
}
- console.log('Notifikasi');
Storage.set('menu-active-state', 'Notifikasi');
}
@@ -51,8 +50,6 @@ export default class NotificationPage extends React.Component {
onClickDismiss = (index) => {
var array = [...this.state.list];
array.splice(index, 1);
- console.log("eh kepencet")
- console.log(index)
this.setState({
list : array
diff --git a/assets/js/ProfilePage.jsx b/assets/js/ProfilePage.jsx
index 3ff64541..c189ff34 100755
--- a/assets/js/ProfilePage.jsx
+++ b/assets/js/ProfilePage.jsx
@@ -114,8 +114,6 @@ export default class ProfilePage extends ProfileHandler {
this.gotoStudentToeflFile = this.gotoStudentToeflFile.bind(this);
this.getProfile();
-
- console.log('profil');
Storage.set('menu-active-state', 'Profil');
}
diff --git a/assets/js/components/VacancyList.jsx b/assets/js/components/VacancyList.jsx
index c7cb9833..35916c14 100755
--- a/assets/js/components/VacancyList.jsx
+++ b/assets/js/components/VacancyList.jsx
@@ -176,8 +176,6 @@ export default class VacancyList extends React.Component {
salary={this.props.salary}
/>
));
- console.log(vacancies);
- console.log("ini cuy")
vacancies = this.sortVacancies(vacancies);
vacancies = this.filterVacanciesBasedOnSalary(vacancies);
vacancies = this.filterVacanciesBasedOnVacancyStatus(vacancies);
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
new file mode 100644
index 00000000..57524796
--- /dev/null
+++ b/core/migrations/0001_initial.py
@@ -0,0 +1,217 @@
+# Generated by Django 2.2.8 on 2019-12-06 13:26
+
+import core.lib.validators
+import core.models.accounts
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Application',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('cover_letter', models.TextField(blank=True, null=True)),
+ ('status', models.IntegerField(default=0)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Company',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ('description', models.TextField()),
+ ('founded', models.DateField(blank=True, null=True)),
+ ('status', models.IntegerField(default=0, validators=[django.core.validators.MaxValueValidator(2), django.core.validators.MinValueValidator(0)])),
+ ('logo', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_company_logo_file_path, validators=[core.lib.validators.validate_image_file_extension])),
+ ('address', models.CharField(blank=True, max_length=1000, null=True)),
+ ('category', models.CharField(default='Belum ada kategori perusahaan', max_length=140)),
+ ('size', models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(1)])),
+ ('website', models.CharField(default='Belum ada link website', max_length=100)),
+ ('linkedin_url', models.URLField(blank=True, null=True)),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'ordering': ['-updated'],
+ },
+ ),
+ migrations.CreateModel(
+ name='Recommendation',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('content', models.TextField(blank=True)),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ],
+ options={
+ 'ordering': ['-updated'],
+ },
+ ),
+ migrations.CreateModel(
+ name='Vacancy',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('verified', models.BooleanField(default=False)),
+ ('open_time', models.DateTimeField()),
+ ('description', models.TextField(blank=True)),
+ ('requirements', models.TextField(blank=True)),
+ ('responsibilities', models.TextField(blank=True)),
+ ('close_time', models.DateTimeField()),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ('name', models.CharField(max_length=100)),
+ ('amount', models.IntegerField(null=True)),
+ ('max_accepted_applicants', models.IntegerField(default=0)),
+ ('benefits', models.TextField(blank=True)),
+ ('working_period', models.CharField(max_length=100, null=True)),
+ ('tag', models.TextField(blank=True)),
+ ('salary', models.IntegerField(default=0)),
+ ('recruiter_activity', models.CharField(blank=True, max_length=10, null=True)),
+ ('office_address', models.TextField(blank=True, default='')),
+ ('company', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vacancies', to='core.Company')),
+ ],
+ options={
+ 'ordering': ['-updated'],
+ },
+ ),
+ migrations.CreateModel(
+ name='ReasonRejected',
+ fields=[
+ ('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='core.Application')),
+ ('reason', models.TextField(default='Tidak memenuhi kualifikasi perusahaan.')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='VacancyMilestone',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=100)),
+ ('detail', models.TextField()),
+ ('expected_start', models.DateField()),
+ ('expected_finish', models.DateField()),
+ ('vacancy', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='milestones', to='core.Vacancy')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Supervisor',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ('nip', models.IntegerField(unique=True, validators=[django.core.validators.MinValueValidator(100000000), django.core.validators.MaxValueValidator(9999999999)])),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'ordering': ['-updated'],
+ },
+ ),
+ migrations.CreateModel(
+ name='Student',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('updated', models.DateTimeField(auto_now=True)),
+ ('npm', models.IntegerField(unique=True, validators=[core.lib.validators.validate_npm])),
+ ('resume', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_student_resume_file_path, validators=[django.core.validators.FileExtensionValidator(['pdf'])])),
+ ('sertifikat', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_student_sertifikat_file_path, validators=[core.lib.validators.validate_document_file_extension])),
+ ('phone_number', models.CharField(blank=True, db_index=True, max_length=100, null=True, validators=[django.core.validators.RegexValidator('^0\\d{1,11}$')])),
+ ('gender', models.CharField(blank=True, max_length=30, null=True)),
+ ('birth_place', models.CharField(blank=True, max_length=30, null=True)),
+ ('birth_date', models.DateField(blank=True, null=True)),
+ ('major', models.CharField(blank=True, max_length=30, null=True)),
+ ('batch', models.CharField(blank=True, max_length=4, null=True)),
+ ('show_transcript', models.BooleanField(default=False)),
+ ('photo', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_student_photo_file_path, validators=[django.core.validators.FileExtensionValidator(['jpg', 'jpeg', 'png'])])),
+ ('self_description', models.CharField(blank=True, db_index=True, max_length=500, null=True)),
+ ('portfolio_link', models.URLField(blank=True, null=True)),
+ ('linkedin_url', models.URLField(blank=True, null=True)),
+ ('hackerrank_url', models.URLField(blank=True, null=True)),
+ ('website_url', models.URLField(blank=True, null=True)),
+ ('work_experience', models.CharField(blank=True, max_length=500, null=True)),
+ ('region', models.CharField(blank=True, max_length=30, null=True, validators=[django.core.validators.RegexValidator('^[A-Za-z]+$')])),
+ ('alamat', models.CharField(blank=True, max_length=50, null=True)),
+ ('skills', models.CharField(blank=True, max_length=50, null=True)),
+ ('ui_ux_portofolio', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_student_ui_ux_portofolio_file_path, validators=[core.lib.validators.validate_document_file_extension])),
+ ('latest_work', models.CharField(blank=True, max_length=100, null=True)),
+ ('latest_work_desc', models.TextField(blank=True, null=True)),
+ ('github_url', models.URLField(blank=True, null=True)),
+ ('gitlab_url', models.URLField(blank=True, null=True)),
+ ('intro', models.CharField(blank=True, max_length=50, null=True)),
+ ('expected_salary', models.CharField(blank=True, max_length=10, null=True, validators=[django.core.validators.RegexValidator('^\\d{0,10}$')])),
+ ('job_seeking_status', models.CharField(blank=True, max_length=30, null=True)),
+ ('student_gpa', models.FloatField(blank=True, db_column='student_gpa', default=1.0, null=True, validators=[core.lib.validators.validate_student_gpa])),
+ ('student_toefl', models.IntegerField(blank=True, db_column='toefl', default=0, null=True, validators=[core.lib.validators.validate_toefl_score])),
+ ('student_toefl_file', models.FileField(blank=True, null=True, upload_to=core.models.accounts.get_student_toefl_file_path, validators=[django.core.validators.FileExtensionValidator(['pdf'])])),
+ ('volunteer', models.CharField(blank=True, max_length=100, null=True)),
+ ('awards', models.CharField(blank=True, max_length=100, null=True)),
+ ('projects', models.CharField(blank=True, max_length=100, null=True)),
+ ('certification', models.CharField(blank=True, max_length=100, null=True)),
+ ('languages', models.CharField(blank=True, max_length=100, null=True, validators=[core.lib.validators.validate_languages_contains_string_type_value])),
+ ('seminar', models.CharField(blank=True, max_length=100, null=True)),
+ ('interests', models.CharField(blank=True, max_length=100, null=True)),
+ ('dependants', models.IntegerField(blank=True, db_column='dependants', default=0, null=True)),
+ ('related_course', models.CharField(blank=True, max_length=200, null=True)),
+ ('ielts', models.FloatField(blank=True, db_column='ielts', default=1.0, null=True)),
+ ('applied_vacancies', models.ManyToManyField(blank=True, related_name='applied_vacancies', through='core.Application', to='core.Vacancy')),
+ ('bookmarked_vacancies', models.ManyToManyField(blank=True, related_name='bookmarked_vacancies', to='core.Vacancy')),
+ ('recommendations', models.ManyToManyField(blank=True, related_name='recommendations', to='core.Recommendation')),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'ordering': ['-updated'],
+ },
+ ),
+ migrations.AddField(
+ model_name='recommendation',
+ name='recommendation_giver',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='giver', to='core.Student'),
+ ),
+ migrations.AddField(
+ model_name='recommendation',
+ name='recommendation_receiver',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='receiver', to='core.Student'),
+ ),
+ migrations.CreateModel(
+ name='Feedback',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created', models.DateTimeField(auto_now_add=True)),
+ ('title', models.CharField(blank=True, default='', max_length=100)),
+ ('content', models.TextField()),
+ ('companyId', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Company')),
+ ('studentId', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Student')),
+ ],
+ options={
+ 'ordering': ['created'],
+ },
+ ),
+ migrations.AddField(
+ model_name='application',
+ name='student',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Student'),
+ ),
+ migrations.AddField(
+ model_name='application',
+ name='vacancy',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Vacancy'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='recommendation',
+ unique_together={('recommendation_giver', 'recommendation_receiver')},
+ ),
+ migrations.AlterUniqueTogether(
+ name='application',
+ unique_together={('student', 'vacancy')},
+ ),
+ ]
--
GitLab