Merge branch 'feature-delete'

arcxon · May 31, 2016 · 30f7153 · 30f7153
2 parents 7e78619 + d73c72f
commit 30f7153
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/data.tdx b/data.tdx
diff --git a/fabric.cpp b/fabric.cpp
@@ -147,7 +147,7 @@ void List::indexView() {
     cout << endl << endl;
 
     for (int i = 0; i < _listIndex; i++) {
-        cout << i << ". [" << list[i].status << "]  ";
+        cout << " " << i << ". [" << list[i].status << "]  ";
         cout << list[i].content << endl;
     }
 }
@@ -172,9 +172,9 @@ void List::tagIndexView() {
     cout << title << endl;
     cout << "============" << endl;
 
-    cout << "Tags : ";
+    cout << "Tags :" << endl;
     for (int i = 0; i < _tagIndex; i++) {
-        cout << i << ". " << tags[i] << endl;
+        cout << " " << i << ". " << tags[i] << endl;
     }
 }
 
@@ -198,10 +198,10 @@ void List::removeTodo(int index) {
 }
 
 void List::removeTag(int index) {
-    for (int i = index; i < _listIndex; i++) {
-        list[i] = list[i + 1];
+    for (int i = index; i < _tagIndex; i++) {
+        strcpy(tags[i], tags[i + 1]);
     }
-    _listIndex--;
+    _tagIndex--;
 }
 
 

diff --git a/main.cpp b/main.cpp
@@ -184,7 +184,7 @@ int parse(char command[80]){
         // Delete Things
 
         char choice[10];
-        cout << "What do you want to delete? (list/todo)" << endl << Bred << " ?> " << normal;
+        cout << "What do you want to delete? (list/todo/tag)" << endl << Bred << " ?> " << normal;
         cin.getline(choice, sizeof(choice));
 
         if (!(strcmp(choice, "list") * strcmp(choice, "List"))) {
@@ -196,7 +196,7 @@ int parse(char command[80]){
             cout << Bblue << " #> " << normal;
             cin >> index;
             cin.ignore();
-            cout << "Are you sure, This cannot be undone, This will delete ->" << endl;
+            cout << "Are you sure, This cannot be undone, This will delete the List ->" << endl;
             arrayL[index].view();
 
             if ( confirm() ) {
@@ -218,7 +218,7 @@ int parse(char command[80]){
                 cout << Bblue << " #> " << normal;
                 cin >> index;
                 cin.ignore();
-                cout << "Are you sure, This cannot be undone, This will delete ->" << endl;
+                cout << "Are you sure, This cannot be undone, This will delete the ToDo ->" << endl;
                 currentL.todoView(index);
 
                 if ( confirm() ) {
@@ -239,16 +239,16 @@ int parse(char command[80]){
                 int index;
 
                 cout << "Enter the Index of Tag to Delete " << endl;
-                currentL.indexView();
+                currentL.tagIndexView();
 
                 cout << Bblue << " #> " << normal;
                 cin >> index;
                 cin.ignore();
-                cout << "Are you sure, This cannot be undone, This will delete ->" << endl;
-                currentL.todoView(index);
+                cout << "Are you sure, This cannot be undone, This will delete the Tag ->" << endl;
+                cout << currentL.tags[index] << endl;
 
                 if ( confirm() ) {
-                    currentL.removeTodo(index);
+                    currentL.removeTag(index);
                 }
 
                 arrayL[_currentLindex] = currentL;  // To Help Improving Finalization